bugfix : we can recieve messages from offline contacts (invisible or offline stored messages). In thoses cases do not select contact in roster.
This commit is contained in:
parent
2860211def
commit
360570cf2d
|
@ -805,7 +805,10 @@ class roster_Window:
|
||||||
'not in list', 'not in list', 'none', '')
|
'not in list', 'not in list', 'none', '')
|
||||||
self.add_user_to_roster(user1, account)
|
self.add_user_to_roster(user1, account)
|
||||||
iter = self.get_user_iter(jid, account)
|
iter = self.get_user_iter(jid, account)
|
||||||
path = self.tree.get_model().get_path(iter)
|
if iter:
|
||||||
|
path = self.tree.get_model().get_path(iter[0])
|
||||||
|
else:
|
||||||
|
path = None
|
||||||
autopopup = self.plugin.config['autopopup']
|
autopopup = self.plugin.config['autopopup']
|
||||||
if autopopup == 0 and not \
|
if autopopup == 0 and not \
|
||||||
self.plugin.windows[account]['chats'].has_key(jid):
|
self.plugin.windows[account]['chats'].has_key(jid):
|
||||||
|
@ -817,18 +820,20 @@ class roster_Window:
|
||||||
model.set_value(i, 0, self.pixbufs['message'])
|
model.set_value(i, 0, self.pixbufs['message'])
|
||||||
tim = time.strftime("[%H:%M:%S]")
|
tim = time.strftime("[%H:%M:%S]")
|
||||||
self.plugin.queues[account][jid].put((msg, tim))
|
self.plugin.queues[account][jid].put((msg, tim))
|
||||||
self.tree.expand_row(path[0:1], FALSE)
|
if path:
|
||||||
self.tree.expand_row(path[0:2], FALSE)
|
|
||||||
self.tree.scroll_to_cell(path)
|
|
||||||
self.tree.set_cursor(path)
|
|
||||||
else:
|
|
||||||
if not self.plugin.windows[account]['chats'].has_key(jid):
|
|
||||||
self.tree.expand_row(path[0:1], FALSE)
|
self.tree.expand_row(path[0:1], FALSE)
|
||||||
self.tree.expand_row(path[0:2], FALSE)
|
self.tree.expand_row(path[0:2], FALSE)
|
||||||
self.tree.scroll_to_cell(path)
|
self.tree.scroll_to_cell(path)
|
||||||
self.tree.set_cursor(path)
|
self.tree.set_cursor(path)
|
||||||
|
else:
|
||||||
|
if not self.plugin.windows[account]['chats'].has_key(jid):
|
||||||
self.plugin.windows[account]['chats'][jid] = \
|
self.plugin.windows[account]['chats'][jid] = \
|
||||||
message_Window(self.contacts[account][jid], self.plugin, account)
|
message_Window(self.contacts[account][jid], self.plugin, account)
|
||||||
|
if path:
|
||||||
|
self.tree.expand_row(path[0:1], FALSE)
|
||||||
|
self.tree.expand_row(path[0:2], FALSE)
|
||||||
|
self.tree.scroll_to_cell(path)
|
||||||
|
self.tree.set_cursor(path)
|
||||||
self.plugin.windows[account]['chats'][jid].print_conversation(msg)
|
self.plugin.windows[account]['chats'][jid].print_conversation(msg)
|
||||||
|
|
||||||
def on_prefs(self, widget):
|
def on_prefs(self, widget):
|
||||||
|
|
Loading…
Reference in New Issue