bug with the status icon and number of accounts

This commit is contained in:
Dimitur Kirov 2005-07-30 09:09:47 +00:00
parent f754367ef5
commit 990a7f62d7

View file

@ -101,7 +101,7 @@ class Systray:
self.set_tooltip(nb) # update the tooltip self.set_tooltip(nb) # update the tooltip
def change_status(self, global_status = 'offline'): def change_status(self, global_status = None):
''' change the tooltip text and set tray image to 'global_status' ''' ''' change the tooltip text and set tray image to 'global_status' '''
text, single, multiline, multilined = 'Gajim', '', '', False text, single, multiline, multilined = 'Gajim', '', '', False
if gajim.contacts: if gajim.contacts:
@ -129,9 +129,9 @@ class Systray:
text += ' - ' + helpers.get_uf_show('offline') text += ' - ' + helpers.get_uf_show('offline')
# change image and status, only if it is different # change image and status, only if it is different
if self.status != global_status: if global_status is not None and self.status != global_status:
self.status = global_status self.status = global_status
self.set_img() self.set_img()
self.tip.set_tip(self.t, text) self.tip.set_tip(self.t, text)
def start_chat(self, widget, account, jid): def start_chat(self, widget, account, jid):
@ -328,12 +328,12 @@ class Systray:
# and we set the appropriate tooltip # and we set the appropriate tooltip
if unread_messages_no > 1: if unread_messages_no > 1:
text = _('Gajim - %s unread messages') % unread_messages_no text = _('Gajim - %s unread messages') % unread_messages_no
self.tip.set_tip(self.t, text)
elif unread_messages_no == 1: elif unread_messages_no == 1:
text = _('Gajim - 1 unread message') text = _('Gajim - 1 unread message')
self.tip.set_tip(self.t, text)
else: # it's None or 0 else: # it's None or 0
uf_show = helpers.get_uf_show(self.status) self.change_status()
text = _('Gajim - %s') % uf_show
self.tip.set_tip(self.t, text)
def hide_icon(self): def hide_icon(self):
if self.t: if self.t: