Changeset 7829 for branches/gajim_0.11/src/profile_window.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

• branches/gajim_0.11/src/profile_window.py (modified) (3 diffs)

branches/gajim_0.11/src/profile_window.py

@@ -111 +111 @@
         def on_set_avatar_button_clicked(self, widget):
                 def on_ok(widget, path_to_file):
+                        must_delete = False
                         filesize = os.path.getsize(path_to_file) # in bytes
                         #FIXME: use messages for invalid file for 0.11
@@ -141 +142 @@
                                                         'avatar_scaled.png')
                                                 scaled_pixbuf.save(path_to_file, 'png')
+                                                must_delete = True
                         self.dialog.destroy()
 
@@ -155 +157 @@
                         # returns None if unknown type
                         self.avatar_mime_type = mimetypes.guess_type(path_to_file)[0]
+                        if must_delete: 
+                                try: 
+                                        os.remove(path_to_file) 
+                                except OSError: 
+                                        gajim.log.debug('Cannot remove %s' % path_to_file)
 
                 def on_clear(widget):