Changeset 8953

Timestamp:

11/09/07 19:22:23 (13 months ago)

Author:

asterix

Message:

improve AvatarChooserDialog?

Location:

trunk/src

Files:

• dialogs.py (modified) (1 diff)
• profile_window.py (modified) (4 diffs)

trunk/src/dialogs.py

@@ -2776 +2776 @@
                         on_response_cancel = on_response_cancel)
 
+                self.connect('destroy', on_response_cancel)
+
                 filter = gtk.FileFilter()
                 filter.set_name(_('All files'))

trunk/src/profile_window.py

@@ -48 +48 @@
                 self.jid = gajim.get_jid_from_account(account)
 
+                self.dialog = None
                 self.avatar_mime_type = None
                 self.avatar_encoded = None
@@ -76 +77 @@
                         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):
@@ -138 +141 @@
                                 return
                         self.dialog.destroy()
+                        self.dialog = None
                         button = self.xml.get_widget('PHOTO_button')
                         image = button.get_image()
@@ -155 +159 @@
                 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):