changeset a4fe5b28e9e0 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=a4fe5b28e9e0 description: fix missing part of the commit. Fixes #7225

diffstat:

src/gtkgui_helpers.py | 1 - src/gui_interface.py | 6 +++--- src/statusicon.py | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 0ded48e58747 -r a4fe5b28e9e0 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Aug 31 09:54:32 2012 +0200 +++ b/src/gtkgui_helpers.py Fri Aug 31 11:46:45 2012 +0200 @@ -1049,7 +1049,6 @@ if (os.path.exists(path)): gajim.interface.jabber_state_images['24'] = load_iconset(path) else: - gajim.interface.jabber_state_images['24'] = {} # Resize 32x32 icons to 24x24 for each in gajim.interface.jabber_state_images['32']: img = gtk.Image() diff -r 0ded48e58747 -r a4fe5b28e9e0 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 31 09:54:32 2012 +0200 +++ b/src/gui_interface.py Fri Aug 31 11:46:45 2012 +0200 @@ -916,7 +916,7 @@ request = obj.stanza.getTag('jingle').getTag('content')\ .getTag('description').getTag('request') if request: - # If we get a request instead + # If we get a request instead return contact = gajim.contacts.get_first_contact_from_jid(account, obj.jid) if helpers.allow_popup_window(account): @@ -2675,8 +2675,8 @@ gajim.thread_interface = ThreadInterface # This is the manager and factory of message windows set by the module self.msg_win_mgr = None - self.jabber_state_images = {'16': {}, '32': {}, 'opened': {}, - 'closed': {}} + self.jabber_state_images = {'16': {}, '24': {}, '32': {}, 'opened': {}, + 'closed': {}} self.emoticons_menu = None # handler when an emoticon is clicked in emoticons_menu self.emoticon_menuitem_clicked = None diff -r 0ded48e58747 -r a4fe5b28e9e0 src/statusicon.py --- a/src/statusicon.py Fri Aug 31 09:54:32 2012 +0200 +++ b/src/statusicon.py Fri Aug 31 11:46:45 2012 +0200 @@ -118,6 +118,8 @@ def on_status_icon_size_changed(self, statusicon, size): if size > 31: self.statusicon_size = '32' + elif size > 23: + self.statusicon_size = '24' else: self.statusicon_size = '16' if os.environ.get('KDE_FULL_SESSION') == 'true':