Changeset 7949

Timestamp:

02/07/07 20:05:23 (22 months ago)

Author:

asterix

Message:

merge diff from trunk

Location:

branches/gajim_0.11/src

Files:

• conversation_textview.py (modified) (2 diffs)
• gajim.py (modified) (3 diffs)

branches/gajim_0.11/src/conversation_textview.py

@@ -583 +583 @@
                 if gajim.config.get('emoticons_theme') and \
                 possible_emot_ascii_caps in gajim.interface.emoticons.keys():
-                        #it's an emoticon
+                        # it's an emoticon
                         emot_ascii = possible_emot_ascii_caps
                         end_iter = buffer.get_end_iter()
                         anchor = buffer.create_child_anchor(end_iter)
                         img = gtk.Image()
-                        img.set_from_file(gajim.interface.emoticons[emot_ascii])
+                        animations = gajim.interface.emoticons_animations
+                        if not emot_ascii in animations:
+                                animations[emot_ascii] = gtk.gdk.PixbufAnimation(
+                                        gajim.interface.emoticons[emot_ascii])
+                        img.set_from_animation(animations[emot_ascii])
                         img.show()
-                        #add with possible animation
+                        # add with possible animation
                         self.tv.add_child_at_anchor(img, anchor)
                 #FIXME: one day, somehow sync with regexp in gajim.py
@@ -604 +608 @@
                         special_text.startswith('sip:') or \
                         special_text.startswith('magnet:'):
-                        #it's a url
+                        # it's a url
                         tags.append('url')
                         use_other_tags = False

branches/gajim_0.11/src/gajim.py

@@ -1515 +1515 @@
                 gajim.block_signed_in_notifications[account] = True
                 self.roster.actions_menu_needs_rebuild = True
-                if gajim.interface.sleeper.getState() != common.sleepy.STATE_UNKNOWN and \
+                if self.sleeper.getState() != common.sleepy.STATE_UNKNOWN and \
                 gajim.connections[account].connected in (2, 3):
                         # we go online or free for chat, so we activate auto status
@@ -1789 +1789 @@
                 counter = 0
                 # Calculate the side lenght of the popup to make it a square
-                size = int(round(math.sqrt(len(gajim.interface.emoticons_images))))
-                for image in gajim.interface.emoticons_images:
+                size = int(round(math.sqrt(len(self.emoticons_images))))
+                for image in self.emoticons_images:
                         item = gtk.MenuItem()
                         img = gtk.Image()
@@ -1815 +1815 @@
                 self.emoticons_images = list()
                 self.emoticons = dict()
+                self.emoticons_animations = dict()
 
                 path = os.path.join(gajim.DATA_DIR, 'emoticons', emot_theme)