Attachment 66805 Details for Bug 47647 – update the patch.

[patch] update the patch.

patch (text/plain), 1.38 KB, created by Weng Xuetian on 2012-09-07 15:35:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Weng Xuetian

Created: 2012-09-07 15:35:03 UTC

Size: 1.38 KB

patch

obsolete

>diff --git a/TelepathyQt/contact-manager.cpp b/TelepathyQt/contact-manager.cpp
>index a67e736..acbf5d0 100644
>--- a/TelepathyQt/contact-manager.cpp
>+++ b/TelepathyQt/contact-manager.cpp
>@@ -1342,16 +1342,24 @@ void ContactManager::onAvatarRetrieved(uint handle, const QString &token,
>         debug() << "MimeType:" << mimeType;
> 
>         QTemporaryFile mimeTypeFile(mimeTypeFileName);
>-        mimeTypeFile.open();
>-        mimeTypeFile.write(mimeType.toLatin1());
>-        mimeTypeFile.setAutoRemove(false);
>-        mimeTypeFile.rename(mimeTypeFileName);
>+        if (mimeTypeFile.open()) {
>+            mimeTypeFile.write(mimeType.toLatin1());
>+            mimeTypeFile.setAutoRemove(false);
>+            QFile::remove(mimeTypeFileName);
>+            if (!mimeTypeFile.rename(mimeTypeFileName)) {
>+                mimeTypeFile.remove();
>+            }
>+        }
> 
>         QTemporaryFile avatarFile(avatarFileName);
>-        avatarFile.open();
>-        avatarFile.write(data);
>-        avatarFile.setAutoRemove(false);
>-        avatarFile.rename(avatarFileName);
>+        if (avatarFile.open()) {
>+            avatarFile.write(data);
>+            avatarFile.setAutoRemove(false);
>+            QFile::remove(avatarFileName);
>+            if (!avatarFile.rename(avatarFileName)) {
>+                avatarFile.remove();
>+            }
>+        }
>     }
> 
>     ContactPtr contact = lookupContactByHandle(handle);

Actions: View | Splinter Review

Attachments on bug 47647: 66794 | 66805 | 67631

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.