Changeset 9569

Timestamp:

05/04/08 02:24:27 (7 months ago)

Author:

bct

Message:

pm bugfix

Location:

branches/session_centric/src

Files:

• chat_control.py (modified) (6 diffs)
• gajim.py (modified) (1 diff)
• groupchat_control.py (modified) (5 diffs)
• message_control.py (modified) (3 diffs)
• message_window.py (modified) (3 diffs)

branches/session_centric/src/chat_control.py

@@ -1587 +1587 @@
                         unread = '[' + unicode(num_unread) + ']'
 
-                # Draw tab label using chatstate 
+                # Draw tab label using chatstate
                 theme = gajim.config.get('roster_theme')
                 color = None
@@ -1847 +1847 @@
                 self.contact.our_chatstate = None
 
+                # terminate session
                 self.session.control = None
 
@@ -2078 +2079 @@
                 # Is it a pm ?
                 room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
-# XXX fixme somehow
-#               control = gajim.interface.msg_win_mgr.get_control(room_jid, self.account)
-#               if control and control.type_id == message_control.TYPE_GC:
-#                       control.update_ui()
-#                       control.parent_win.show_title()
-#                       typ = 'pm'
+                control = gajim.interface.msg_win_mgr.get_gc_control(room_jid, self.account)
+                if control and control.type_id == message_control.TYPE_GC:
+                        control.update_ui()
+                        control.parent_win.show_title()
+                        typ = 'pm'
 
                 self.redraw_after_event_removed(jid)
@@ -2094 +2094 @@
                                 gajim.interface.roster.really_remove_contact(self.contact,
                                         self.account)
-#                       elif typ == 'pm':
-#                               control.remove_contact(nick)
+                        elif typ == 'pm':
+                                control.remove_contact(nick)
 
         def show_bigger_avatar(self, small_avatar):
@@ -2141 +2141 @@
                 if gtk.gtk_version >= (2, 10, 0) and gtk.pygtk_version >= (2, 10, 0):
                         window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP)
-                
+
                 window.realize()
                 window.window.set_back_pixmap(pixmap, False) # make it transparent
                 window.window.shape_combine_mask(mask, 0, 0)
 
-                # make the bigger avatar window show up centered 
+                # make the bigger avatar window show up centered
                 x0, y0 = small_avatar.window.get_origin()
                 x0 += small_avatar.allocation.x
@@ -2152 +2152 @@
                 center_x= x0 + (small_avatar.allocation.width / 2)
                 center_y = y0 + (small_avatar.allocation.height / 2)
-                pos_x, pos_y = center_x - (avatar_w / 2), center_y - (avatar_h / 2) 
+                pos_x, pos_y = center_x - (avatar_w / 2), center_y - (avatar_h / 2)
                 window.move(pos_x, pos_y)
                 # make the cursor invisible so we can see the image

branches/session_centric/src/gajim.py

@@ -1925 +1925 @@
                                 new_sess = gajim.connections[account].make_new_session(str(jid))
                                 ctrl.set_session(new_sess)
+                                gajim.connections[account].delete_session(str(jid), session.thread_id)
 
                                 if was_encrypted:

branches/session_centric/src/groupchat_control.py

@@ -605 +605 @@
 
                 # We print if window is opened
-                pm_control = gajim.interface.msg_win_mgr.get_control(fjid, self.account, session)
+                pm_control = session.control
 
                 if pm_control:
@@ -633 +633 @@
                                 self.parent_win.redraw_tab(self)
                 else:
-                        self._start_private_message(nick, session)
+                        self._start_private_message(nick)
                 # Scroll to line
                 self.list_treeview.expand_row(path[0:1], False)
@@ -892 +892 @@
                 fjid = gajim.construct_fjid(self.room_jid, nick) # 'fake' jid
 
-                self._start_private_message(nick)
+                ctrl = self._start_private_message(nick)
                 if msg:
-                        gajim.interface.msg_win_mgr.get_control(fjid, self.account).\
-                                send_message(msg)
+                        ctrl.send_message(msg)
 
         def on_send_file(self, widget, gc_contact):
@@ -2042 +2041 @@
                 win.window.present()
 
+                return ctrl
+
         def on_row_activated(self, widget, path):
                 '''When an iter is activated (dubblick or single click if gnome is set
@@ -2100 +2101 @@
 
                         if gajim.single_click and not event.state & gtk.gdk.SHIFT_MASK:
-                                self.on_row_activated(widget, path)                     
+                                self.on_row_activated(widget, path)
                                 return True
                         else:

branches/session_centric/src/message_control.py

@@ -118 +118 @@
 
         def set_session(self, session):
-                if hasattr(self, 'session') and session == self.session:
+                oldsession = None
+                if hasattr(self, 'session'):
+                        oldsession = self.session
+
+                if oldsession and session == oldsession:
                         return
-
-                was_encrypted = False
-
-                if hasattr(self, 'session') and self.session:
-                        if self.session.enable_encryption:
-                                was_encrypted = True
-
-                        gajim.connections[self.account].delete_session(self.session.jid,
-                                                                        self.session.thread_id)
 
                 self.session = session
@@ -135 +130 @@
                         session.control = self
 
-                        if was_encrypted:
-                                self.print_esession_details()
+                        if oldsession:
+                                self.parent_win.change_thread_key(self.contact.jid,
+                                                self.account, oldsession.thread_id, session.thread_id)
+
+                                if oldsession.enable_encryption:
+                                        self.print_esession_details()
 
         def send_message(self, message, keyID = '', type = 'chat',
@@ -145 +144 @@
                 jid = self.contact.jid
 
-                if not self.session:
-                        print('uhoh new session')
-                        fjid = self.contact.get_full_jid()
-                        new_session = gajim.connections[self.account].make_new_session(fjid)
-
-                        self.set_session(new_session)
-
                 # Send and update history
                 return gajim.connections[self.account].send_message(jid, message, keyID,

branches/session_centric/src/message_window.py

@@ -430 +430 @@
                 fjid = ctrl.get_full_jid()
                 thread_id = ctrl.session.thread_id
+
                 del self._controls[ctrl.account][fjid][thread_id]
 
@@ -568 +569 @@
 
         def change_key(self, old_jid, new_jid, acct):
-                '''Change the key of a control'''
+                '''Change the JID key of a control'''
                 try:
-                        # Check if control exists
-                        ctrl = self._controls[acct][old_jid]
-                except:
+                        # Check if controls exists
+                        ctrls = self._controls[acct][old_jid]
+                except KeyError:
                         return
-                self._controls[acct][new_jid] = self._controls[acct][old_jid]
+                self._controls[acct][new_jid] = ctrls
                 del self._controls[acct][old_jid]
                 if old_jid in gajim.last_message_time[acct]:
@@ -580 +581 @@
                                 gajim.last_message_time[acct][old_jid]
                         del gajim.last_message_time[acct][old_jid]
+
+        def change_thread_key(self, jid, acct, old_thread_id, new_thread_id):
+                '''Change the thread_id key of a control'''
+                try:
+                        # Check if control exists
+                        ctrl = self._controls[acct][jid][old_thread_id]
+                except KeyError:
+                        return
+
+                self._controls[acct][jid][new_thread_id] = ctrl
+                del self._controls[acct][jid][old_thread_id]
 
         def controls(self):