Changeset 8955 for branches/gajim_0.11.2/src/profile_window.py

Timestamp:

11/09/07 20:30:15 (13 months ago)

Author:

asterix

Message:

merge some fixes from trunk: [8864] [8866] [8881] [8884] [8887] [8894] [8895] [8902] [8903] [8904] [8905] [8906] [8910] [8918] [8919] [8921] [8923] [8924] [8938] [8942] [8952] [8953] [8954]

Files:

• branches/gajim_0.11.2/src/profile_window.py (modified) (4 diffs)

branches/gajim_0.11.2/src/profile_window.py

@@ -67 +67 @@
                 self.jid = gajim.get_jid_from_account(account)
 
+                self.dialog = None
                 self.avatar_mime_type = None
                 self.avatar_encoded = None
@@ -99 +100 @@
                         gobject.source_remove(self.remove_statusbar_timeout_id)
                 del gajim.interface.instances[self.account]['profile']
+                if self.dialog: # Image chooser dialog
+                        self.dialog.destroy()
 
         def on_profile_window_key_press_event(self, widget, event):
@@ -156 +159 @@
                         # rescale it
                         pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'vcard')
+                        self.dialog = None
                         button = self.xml.get_widget('PHOTO_button')
                         image = button.get_image()
@@ -173 +177 @@
                 def on_clear(widget):
                         self.dialog.destroy()
+                        self.dialog = None
                         self.on_clear_button_clicked(widget)
 
-                self.dialog = dialogs.AvatarChooserDialog(on_response_ok = on_ok,
-                        on_response_clear = on_clear)
+                def on_cancel(widget):
+                        self.dialog.destroy()
+                        self.dialog = None
+
+                if self.dialog:
+                        self.dialog.present()
+                else:
+                        self.dialog = dialogs.AvatarChooserDialog(on_response_ok = on_ok,
+                                on_response_cancel = on_cancel, on_response_clear = on_clear)
 
         def on_PHOTO_button_press_event(self, widget, event):