# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sami.saada@gmail.com-20091102233633-86ormqyhh7kz3p7p
# target_branch: bzr+ssh://bazaar.launchpad.net/~qfriendslol-\
#   maintainers/qfriendslol/main/
# testament_sha1: 2051d3617fec623e84efd17907a3215688519119
# timestamp: 2009-11-03 01:38:27 +0200
# base_revision_id: sami.saada@gmail.com-20091102230955-\
#   n0nf3fcjvgtv7nut
# 
# Begin patch
=== modified file 'src/gui/newfriendtab.py'
--- src/gui/newfriendtab.py	2009-11-02 15:07:51 +0000
+++ src/gui/newfriendtab.py	2009-11-02 23:26:05 +0000
@@ -124,8 +124,10 @@
             mugshot = None
         if mugshot:
             mugData = QPixmap()
-            mugData.loadFromData(mugshot)
-            picture.setPixmap(mugData.scaled(100,100, Qt.KeepAspectRatio))
+            if mugData.loadFromData(mugshot) and not mugData.isNull():
+                picture.setPixmap(mugData.scaled(100,100, Qt.KeepAspectRatio))
+            else:
+                picture.setPixmap(QPixmap(self._control.getGFXPath() + '/mugshot_unknown.svg'))
         else:
             picture.setPixmap(QPixmap(self._control.getGFXPath() + '/mugshot_unknown.svg'))
         return picture

=== modified file 'src/gui/userpicture.py'
--- src/gui/userpicture.py	2009-11-02 15:07:51 +0000
+++ src/gui/userpicture.py	2009-11-02 23:31:30 +0000
@@ -28,8 +28,10 @@
         mugshot = self._control.getStore().getMugshot(self._userId)
         if mugshot:
             mugData = QPixmap()
-            mugData.loadFromData(mugshot)
-            pictureData = mugData.scaled(100,100, Qt.KeepAspectRatio)
+            if mugData.loadFromData(mugshot) and not mugData.isNull():
+                pictureData = mugData.scaled(100,100, Qt.KeepAspectRatio)
+            else:
+                pictureData = QPixmap(self._control.getGFXPath() + '/mugshot_unknown.svg')
         else:
             pictureData = QPixmap(self._control.getGFXPath() + '/mugshot_unknown.svg')
         self.setIcon(QIcon(pictureData))

=== modified file 'src/gui/usertabwidget.py'
--- src/gui/usertabwidget.py	2009-11-02 15:07:51 +0000
+++ src/gui/usertabwidget.py	2009-11-02 23:31:30 +0000
@@ -48,8 +48,10 @@
         mugshot = self._control.getStore().getMugshot(uid)
         if mugshot:
             iconData = QPixmap()
-            iconData.loadFromData(mugshot)
-            icon = QIcon(iconData)
+            if iconData.loadFromData(mugshot) and not iconData.isNull():
+                icon = QIcon(iconData)
+            else:
+                icon = self._loadUnknownMugshot()
         else:
             icon = self._loadUnknownMugshot()
         return icon

=== modified file 'src/guicontrol.py'
--- src/guicontrol.py	2009-11-02 22:33:36 +0000
+++ src/guicontrol.py	2009-11-02 23:36:33 +0000
@@ -65,7 +65,12 @@
 
     def updateUserData(self, uid):
         try:
-            rdata = self.getRemote().retrieve('mugshot', uid)
+            rrawdata = self.getRemote().retrieve('mugshot', uid)
+            rpixdata = QPixmap()
+            if rpixdata.loadFromData(rrawdata) and not rpixdata.isNull():
+                rdata = rrawdata
+            else:
+                rdata = None
         except:
             rdata = None
 

# Begin bundle
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