Changeset 9617

Timestamp:

05/11/08 15:20:22 (2 months ago)

Author:

js

Message:

[Kjell Braden] Fix OTR for chat and GC queries for real now.

Files:

• trunk/src/gajim.py (modified) (1 diff)
• trunk/src/otr_windows.py (modified) (1 diff)

trunk/src/gajim.py

@@ -287 +287 @@
-
-                if not no_print:
-
-
+
-                        if ctrl:
-                                ctrl.print_conversation_line(u" [OTR] %s"%msg, 'status', '', None)
-                id = gajim.logger.write('chat_msg_recv', fjid, message=msg, tim=tim)
+                # gajim.logger.write() only marks a message as unread (and so only
+                # returns an id) when fjid is a real contact (NOT if it's a GC private
+                # chat)
-                if id:
-                        gajim.logger.set_read_messages([id])
+        
+        def get_control(self, fjid, account):
+                # first try to get the window with the full jid
+                ctrl = gajim.interface.msg_win_mgr.get_control(fjid, account)
+                if ctrl:
+                        # got one, be happy
+                        return ctrl
+                
+                # otherwise try without the resource
+                ctrl = gajim.interface.msg_win_mgr.get_control(
+                        gajim.get_jid_without_resource(fjid), account)
+                # but only use it when it is not a GC window
+                if ctrl and ctrl.TYPE_ID == message_control.TYPE_CHAT:
+                        return ctrl
-
-        def policy(self, opdata=None, context=None):
-
-
+
+
+
+
+
+
-                if policy <= 0:
-                        policy = gajim.config.get_per("accounts", opdata['account'], "otr_flags")

trunk/src/otr_windows.py

@@ -225 +225 @@
-                        "otr_flags")
-
-
+=
-                        self.gw("otr_default_checkbutton").set_active(0)
-                        for w in self.gw("otr_settings_vbox").get_children():