changeset c63e16d05a79 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=c63e16d05a79 description: [Dicson] Don't always show Tray icon if "only when pending events" option is used. Fixes #5921

diffstat:

src/config.py | 2 -- src/statusicon.py | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 1392e6406655 -r c63e16d05a79 src/config.py --- a/src/config.py Sat Sep 18 23:00:43 2010 +0200 +++ b/src/config.py Sat Sep 18 23:06:36 2010 +0200 @@ -847,12 +847,10 @@ gajim.config.set('trayicon', 'on_event') gajim.interface.systray_enabled = True gajim.interface.systray.show_icon() - gajim.interface.systray.set_img() else: gajim.config.set('trayicon', 'always') gajim.interface.systray_enabled = True gajim.interface.systray.show_icon() - gajim.interface.systray.set_img()

def on_advanced_notifications_button_clicked(self, widget): dialogs.AdvancedNotificationsWindow() diff -r 1392e6406655 -r c63e16d05a79 src/statusicon.py --- a/src/statusicon.py Sat Sep 18 23:00:43 2010 +0200 +++ b/src/statusicon.py Sat Sep 18 23:06:36 2010 +0200 @@ -97,7 +97,6 @@ self.on_status_icon_size_changed)

self.set_img() - self.status_icon.set_visible(True) self.subscribe_events()

def on_status_icon_right_clicked(self, widget, event_button, event_time): @@ -131,9 +130,14 @@ """ if not gajim.interface.systray_enabled: return + if gajim.config.get('trayicon') == 'always': + self.status_icon.set_visible(True) if gajim.events.get_nb_systray_events(): + self.status_icon.set_visible(True) self.status_icon.set_blinking(True) else: + if gajim.config.get('trayicon') == 'on_event': + self.status_icon.set_visible(False) self.status_icon.set_blinking(False)

image = gajim.interface.jabber_state_images[self.statusicon_size][