Changeset 7949 for branches/gajim_0.11/src/gajim.py

Timestamp:

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

Author:

asterix

Message:

merge diff from trunk

Files:

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

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)