From 94bc66dfab5c6bc8217688ff1243a1dd8ad7206e Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 31 Aug 2012 11:46:45 +0200
Subject: [PATCH] fix missing part of the commit. Fixes #7225
---
src/gtkgui_helpers.py | 1 -
src/gui_interface.py | 6 +++---
src/statusicon.py | 2 ++
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 426bfb53b9..436469c280 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -1049,7 +1049,6 @@ def make_jabber_state_images():
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 --git a/src/gui_interface.py b/src/gui_interface.py
index 58e5016ce8..3d96d229cb 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -916,7 +916,7 @@ class Interface:
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 @@ class Interface:
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 --git a/src/statusicon.py b/src/statusicon.py
index 7a109d97ac..6c16242a6a 100644
--- a/src/statusicon.py
+++ b/src/statusicon.py
@@ -118,6 +118,8 @@ class StatusIcon:
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':
--
GitLab