Changeset 10038

Timestamp:

07/27/08 12:21:51 (4 months ago)

Author:

jim++

Message:

Remove useless function and check. Make avatar in notification works with jpeg too. See #4060.

Location:

trunk/src

Files:

• gtkgui_helpers.py (modified) (1 diff)
• notify.py (modified) (2 diffs)
• roster_window.py (modified) (1 diff)
• vcard.py (modified) (1 diff)

trunk/src/gtkgui_helpers.py

@@ -616 +616 @@
         '''Chooses between avatar image and default image.
         Returns full path to the avatar image if it exists,
-        otherwise returns full path to the image.'''
+        otherwise returns full path to the image.
+        generic must be with extension and suffix without'''
         if jid:
+                # we want an avatar
                 puny_jid = helpers.sanitize_filename(jid)
                 path_to_file = os.path.join(gajim.AVATAR_PATH, puny_jid) + suffix
-                filepath, extension = os.path.splitext(path_to_file) 
-                path_to_local_file = filepath + '_local' + extension 
-                if os.path.exists(path_to_local_file):
-                        return path_to_local_file
-                if os.path.exists(path_to_file):
-                        return path_to_file
+                path_to_local_file = path_to_file + '_local'
+                for extension in ('.png', '.jpeg'):
+                        path_to_local_file_full = path_to_local_file + extension
+                        if os.path.exists(path_to_local_file_full):
+                                return path_to_local_file_full 
+                for extension in ('.png', '.jpeg'):
+                        path_to_file_full = path_to_file + extension
+                        if os.path.exists(path_to_file_full):
+                                return path_to_file_full
         return os.path.abspath(generic)
 

trunk/src/notify.py

@@ -206 +206 @@
                         if event == 'contact_disconnected':
                                 show_image = 'offline.png'
-                                suffix = '_notif_size_bw.png'
+                                suffix = '_notif_size_bw'
                         else: #Status Change or Connected
                                 # FIXME: for status change,
@@ -212 +212 @@
                                 # first need 48x48 for all status
                                 show_image = 'online.png'
-                                suffix = '_notif_size_colored.png'
+                                suffix = '_notif_size_colored'
                         transport_name = gajim.get_transport_name_from_jid(jid)
                         img = None

trunk/src/roster_window.py

@@ -4117 +4117 @@
 
                 ctrl = gajim.interface.msg_win_mgr.get_control(jid, account)
-                if ctrl and ctrl.type_id != message_control.TYPE_GC:
+                if ctrl:
                         ctrl.show_avatar()
 

trunk/src/vcard.py

@@ -121 +121 @@
                 self.progressbar.pulse()
                 return True # loop forever
-
-        def update_avatar_in_gui(self):
-                jid = self.contact.jid
-                # Update roster
-                gajim.interface.roster.draw_avatar(jid, self.account)
-                # Update chat windows
-                ctrl = gajim.interface.msg_win_mgr.get_control(jid, self.account)
-                if ctrl and ctrl.type_id != message_control.TYPE_GC:
-                        ctrl.show_avatar()
 
         def on_vcard_information_window_destroy(self, widget):