Author: asterix Date: 2006-07-17 23:41:11 +0200 (Mon, 17 Jul 2006) New Revision: 6564
Modified: trunk/src/chat_control.py trunk/src/config.py trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/message_window.py trunk/src/roster_window.py trunk/src/systray.py Log: systray now saves unread messages even if it is not enabled (but module is present). Fixes #2134
Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-07-17 20:27:30 UTC (rev 6563) +++ trunk/src/chat_control.py 2006-07-17 21:41:11 UTC (rev 6564) @@ -481,7 +481,7 @@ not self.parent_win.is_active() or not end) and \ kind in ('incoming', 'incoming_queue'): self.nb_unread += 1 - if gajim.interface.systray_enabled and self.notify_on_new_messages(): + if gajim.interface.systray_capabilities and self.notify_on_new_messages(): gajim.interface.systray.add_jid(full_jid, self.account, self.type_id) self.parent_win.redraw_tab(self) if not self.parent_win.is_active(): @@ -556,7 +556,7 @@ self.nb_unread = self.get_specific_unread() self.parent_win.redraw_tab(self) self.parent_win.show_title() - if gajim.interface.systray_enabled: + if gajim.interface.systray_capabilities: gajim.interface.systray.remove_jid(self.get_full_jid(), self.account, self.type_id) @@ -645,7 +645,7 @@ self.nb_unread = self.get_specific_unread() self.parent_win.redraw_tab(self) self.parent_win.show_title() - if gajim.interface.systray_enabled: + if gajim.interface.systray_capabilities: gajim.interface.systray.remove_jid(jid, self.account, self.type_id)
@@ -1362,7 +1362,7 @@ if self.bigger_avatar_window: self.bigger_avatar_window.destroy() # Clean up systray - if gajim.interface.systray_enabled and self.nb_unread > 0: + if gajim.interface.systray_capabilities and self.nb_unread > 0: gajim.interface.systray.remove_jid(self.contact.jid, self.account, self.type_id) # remove all register handlers on wigets, created by self.xml @@ -1561,7 +1561,7 @@ gajim.interface.roster.draw_contact(jid, self.account) # Redraw parent too gajim.interface.roster.draw_parent_contact(jid, self.account) - if gajim.interface.systray_enabled: + if gajim.interface.systray_capabilities: gajim.interface.systray.remove_jid(jid_with_resource, self.account, typ) if (self.contact.show == 'offline' or self.contact.show == 'error'): showOffline = gajim.config.get('showoffline')
Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-07-17 20:27:30 UTC (rev 6563) +++ trunk/src/config.py 2006-07-17 21:41:11 UTC (rev 6564) @@ -1287,7 +1287,7 @@ gajim.interface.instances[name][kind][j].account = name
#upgrade account in systray - if gajim.interface.systray_enabled: + if gajim.interface.systray_capabilities: for list in gajim.interface.systray.jids: if list[0] == self.account: list[0] = name
Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-07-17 20:27:30 UTC (rev 6563) +++ trunk/src/gajim.py 2006-07-17 21:41:11 UTC (rev 6564) @@ -1098,14 +1098,14 @@ self.roster.show_title() if no_queue: # We didn't have a queue: we change icons self.roster.draw_contact(jid, account) - if self.systray_enabled: + if self.systray_capanilities: self.systray.add_jid(jid, account, typ)
def redraw_roster_systray(self, account, jid, typ = None): self.roster.nb_unread -= 1 self.roster.show_title() self.roster.draw_contact(jid, account) - if self.systray_enabled: + if self.systray_capabilities: self.systray.remove_jid(jid, account, typ)
def remove_first_event(self, account, jid, typ = None):
Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-07-17 20:27:30 UTC (rev 6563) +++ trunk/src/groupchat_control.py 2006-07-17 21:41:11 UTC (rev 6564) @@ -471,7 +471,7 @@ self.room_jid, icon_name = 'message') image = state_images['message'] model[iter][C_IMG] = image - if gajim.interface.systray_enabled: + if gajim.interface.systray_capabilities: gajim.interface.systray.add_jid(fjid, self.account, 'pm') self.parent_win.show_title() else:
Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2006-07-17 20:27:30 UTC (rev 6563) +++ trunk/src/message_window.py 2006-07-17 21:41:11 UTC (rev 6564) @@ -270,7 +270,7 @@ ctrl.shutdown()
# Update external state - if gajim.interface.systray_enabled: + if gajim.interface.systray_capabilities: gajim.interface.systray.remove_jid(ctrl.get_full_jid(), ctrl.account, ctrl.type_id) del gajim.last_message_time[ctrl.account][ctrl.get_full_jid()]
Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-07-17 20:27:30 UTC (rev 6563) +++ trunk/src/roster_window.py 2006-07-17 21:41:11 UTC (rev 6564) @@ -2264,7 +2264,7 @@ self.tree.expand_row(path[0:2], False) self.tree.scroll_to_cell(path) self.tree.set_cursor(path) - if gajim.interface.systray_enabled: + if gajim.interface.systray_capabilities: gajim.interface.systray.add_jid(fjid, account, kind)
def on_preferences_menuitem_activate(self, widget):
Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2006-07-17 20:27:30 UTC (rev 6563) +++ trunk/src/systray.py 2006-07-17 21:41:11 UTC (rev 6564) @@ -59,6 +59,8 @@ self.popup_menus = []
def set_img(self): + if not gajim.interface.systray_enabled: + return if len(self.jids) > 0: state = 'message' else: