[SCM] telepathy-qt4 packaging branch, master, updated. 88415080b21e7dad91d91f300f4e5c3f0b3185d9

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=8841508

The following commit has been merged in the master branch:
commit 88415080b21e7dad91d91f300f4e5c3f0b3185d9
Author: Diane Trout <diane at ghic.org>
Date:   Thu Jul 18 10:38:22 2013 -0700

    Revert "Add fix_storing_avatars.patch. Fixes issue storing avatars multiple times."
    
    This reverts commit a8f2f88cda0b83bedd848efe106e5c335f495d7f.
    
    Part of reverting back to the commit that was the base for 0.9.3-1.
    e1aed6d3de0f20a8a1fdce8e9cd65dfbb598efb1
---
 debian/changelog                         |    6 ++--
 debian/patches/fix_storing_avatars.patch |   55 ------------------------------
 debian/patches/series                    |    1 -
 3 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 909f846..c520bb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-telepathy-qt (0.9.3-2) UNRELEASED; urgency=low
+telepathy-qt (0.9.3-1) UNRELEASED; urgency=low
 
   * Team upload.
 
@@ -17,8 +17,6 @@ telepathy-qt (0.9.3-2) UNRELEASED; urgency=low
   * Update Vcs-* fields to canonical URIs.
   * Update Standards-Version: 3.9.4. No changes needed.
   * Add Multi-Arch: same to libtelepathy-qt4-dbg.
-  * Add fix_storing_avatars.patch. Fixes issue storing avatars
-	multiple times.
 
   [ Michał Zając ]
   * Drop fvisibility-inlines-hidden.patch - went upstream
@@ -33,7 +31,7 @@ telepathy-qt (0.9.3-2) UNRELEASED; urgency=low
     it.
   * Update symbols file with current amd64 build.
 
- -- Diane Trout <diane at ghic.org>  Tue, 16 Jul 2013 11:17:57 -0700
+ -- Diane Trout <diane at ghic.org>  Sat, 08 Jun 2013 23:23:32 -0700
 
 telepathy-qt (0.9.1-4) unstable; urgency=low
 
diff --git a/debian/patches/fix_storing_avatars.patch b/debian/patches/fix_storing_avatars.patch
deleted file mode 100644
index 7afbdf7..0000000
--- a/debian/patches/fix_storing_avatars.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
-Description: Fix storing avatars, so that they are not stored millions of times each
- The original problem lies in the fact that QFile::rename() does not
- overwrite existing files. Therefore it fails and the temporary file
- stays on the filesystem together with the already existing avatar
- file. Checking if the file exists before renaming solves this
- partially, but the problem is that this operation is not atomic. There
- can be many processes using tp-qt, fetching avatars at the same time
- from the server, and in this case we can still have a problem
- there. The final solution is to ignore a new avatar that has the same
- token as an avatar that is already on the filesystem. According to the
- spec, different avatars have different tokens, so if an avatar
- changes, the token changes as well.
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47647
-Origin: upstream, http://cgit.freedesktop.org/telepathy/telepathy-qt4/commit/?id=8da9f7069929893bcee64dab22101134752fe618 
---- a/TelepathyQt/contact-manager.cpp
-+++ b/TelepathyQt/contact-manager.cpp
-@@ -1341,17 +1341,27 @@
-         debug() << "Filename:" << avatarFileName;
-         debug() << "MimeType:" << mimeType;
- 
--        QTemporaryFile mimeTypeFile(mimeTypeFileName);
--        mimeTypeFile.open();
--        mimeTypeFile.write(mimeType.toLatin1());
--        mimeTypeFile.setAutoRemove(false);
--        mimeTypeFile.rename(mimeTypeFileName);
-+	if (!QFile::exists(mimeTypeFileName)) {
-+	  QTemporaryFile mimeTypeFile(mimeTypeFileName);
-+	  if (mimeTypeFile.open()) {
-+	    mimeTypeFile.write(mimeType.toLatin1());
-+	    mimeTypeFile.setAutoRemove(false);
-+	    if (!mimeTypeFile.rename(mimeTypeFileName)) {
-+	      mimeTypeFile.remove();
-+	    }
-+	  }
-+	}
- 
--        QTemporaryFile avatarFile(avatarFileName);
--        avatarFile.open();
--        avatarFile.write(data);
--        avatarFile.setAutoRemove(false);
--        avatarFile.rename(avatarFileName);
-+	if (!QFile::exists(avatarFileName)) {
-+	  QTemporaryFile avatarFile(avatarFileName);
-+	  if (avatarFile.open()) {
-+	    avatarFile.write(data);
-+	    avatarFile.setAutoRemove(false);
-+	    if (!avatarFile.rename(avatarFileName)) {
-+	      avatarFile.remove();
-+	    }
-+	  }
-+	}    
-     }
- 
-     ContactPtr contact = lookupContactByHandle(handle);
diff --git a/debian/patches/series b/debian/patches/series
index fbed28c..e505833 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix_storing_avatars.patch
 link-against-gobject.patch

-- 
telepathy-qt4 packaging