Changeset 6347

Timestamp:

05/21/06 21:35:33 (3 years ago)

Author:

jim++

Message:

when clicking on a contact in roster : remove duplicate code, also open awaiting events when middle clicking
instead of always open chat

Files:

• trunk/src/roster_window.py (modified) (4 diffs)

trunk/src/roster_window.py

@@ -1716 +1716 @@
                 # hide tooltip, no matter the button is pressed
                 self.tooltip.hide_tooltip()
+                try:
+                        path, column, x, y = self.tree.get_path_at_pos(int(event.x),
+                                int(event.y))
+                except TypeError:
+                        self.tree.get_selection().unselect_all()
+                        return False
+
                 if event.button == 3: # Right click
-                        try:
-                                path, column, x, y = self.tree.get_path_at_pos(int(event.x),
-                                        int(event.y))
-                        except TypeError:
-                                self.tree.get_selection().unselect_all()
-                                return
                         self.tree.get_selection().select_path(path)
                         model = self.tree.get_model()
@@ -1730 +1731 @@
 
                 elif event.button == 2: # Middle click
-                        try:
-                                path, column, x, y = self.tree.get_path_at_pos(int(event.x),
-                                        int(event.y))
-                        except TypeError:
-                                self.tree.get_selection().unselect_all()
-                                return
                         self.tree.get_selection().select_path(path)
                         model = self.tree.get_model()
@@ -1741 +1736 @@
                         type = model[iter][C_TYPE]
                         if type in ('agent', 'contact'):
-                                account = model[iter][C_ACCOUNT].decode('utf-8')
-                                jid = model[iter][C_JID].decode('utf-8')
-                                win = None
-                                c = gajim.contacts.get_contact_with_highest_priority(account, jid)
-                                if gajim.interface.msg_win_mgr.has_window(c.jid, account):
-                                        win = gajim.interface.msg_win_mgr.get_window(c.jid, account)
-                                elif c:
-                                        self.new_chat(c, account)
-                                        win = gajim.interface.msg_win_mgr.get_window(jid, account)
-                                win.set_active_tab(jid, account)
-                                win.window.present()
+                                self.on_roster_treeview_row_activated(widget, path)
                         elif type == 'account':
                                 account = model[iter][C_ACCOUNT].decode('utf-8')
@@ -1775 +1760 @@
 
                 elif event.button == 1: # Left click
-                        try:
-                                path, column, x, y = self.tree.get_path_at_pos(int(event.x),
-                                        int(event.y))
-                        except TypeError:
-                                self.tree.get_selection().unselect_all()
-                                return False
                         model = self.tree.get_model()
                         iter = model.get_iter(path)