copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix missing part of the commit. Fixes #7225

Browse source
This commit is contained in:
Yann Leboulanger 2012-08-31 11:46:45 +02:00
parent f3caf8b091
commit 94bc66dfab
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gtkgui_helpers.py
View file

@ -1049,7 +1049,6 @@ def make_jabber_state_images():
if (os.path.exists(path)): if (os.path.exists(path)):
gajim.interface.jabber_state_images['24'] = load_iconset(path) gajim.interface.jabber_state_images['24'] = load_iconset(path)
else: else:
gajim.interface.jabber_state_images['24'] = {}
# Resize 32x32 icons to 24x24 # Resize 32x32 icons to 24x24
for each in gajim.interface.jabber_state_images['32']: for each in gajim.interface.jabber_state_images['32']:
img = gtk.Image() img = gtk.Image()

6
src/gui_interface.py
View file

@ -916,7 +916,7 @@ class Interface:
request = obj.stanza.getTag('jingle').getTag('content')\ request = obj.stanza.getTag('jingle').getTag('content')\
.getTag('description').getTag('request') .getTag('description').getTag('request')
if request: if request:
# If we get a request instead # If we get a request instead
return return
contact = gajim.contacts.get_first_contact_from_jid(account, obj.jid) contact = gajim.contacts.get_first_contact_from_jid(account, obj.jid)
if helpers.allow_popup_window(account): if helpers.allow_popup_window(account):
@ -2675,8 +2675,8 @@ class Interface:
gajim.thread_interface = ThreadInterface gajim.thread_interface = ThreadInterface
# This is the manager and factory of message windows set by the module # This is the manager and factory of message windows set by the module
self.msg_win_mgr = None self.msg_win_mgr = None
self.jabber_state_images = {'16': {}, '32': {}, 'opened': {}, self.jabber_state_images = {'16': {}, '24': {}, '32': {}, 'opened': {},
'closed': {}} 'closed': {}}
self.emoticons_menu = None self.emoticons_menu = None
# handler when an emoticon is clicked in emoticons_menu # handler when an emoticon is clicked in emoticons_menu
self.emoticon_menuitem_clicked = None self.emoticon_menuitem_clicked = None

2
src/statusicon.py
View file

@ -118,6 +118,8 @@ class StatusIcon:
def on_status_icon_size_changed(self, statusicon, size): def on_status_icon_size_changed(self, statusicon, size):
if size > 31: if size > 31:
self.statusicon_size = '32' self.statusicon_size = '32'
elif size > 23:
self.statusicon_size = '24'
else: else:
self.statusicon_size = '16' self.statusicon_size = '16'
if os.environ.get('KDE_FULL_SESSION') == 'true': if os.environ.get('KDE_FULL_SESSION') == 'true':