Changeset 9607

Timestamp:

05/10/08 23:29:47 (7 months ago)

Author:

js

Message:

Store otr_userstates at the right place and create it the right way.
This fixes the crash when creating a new account, which made Gajim
unusable on systems where it never ran before.

Location:

trunk

Files:

• config.h.in (modified) (1 diff)
• src/chat_control.py (modified) (4 diffs)
• src/common/connection_handlers.py (modified) (2 diffs)
• src/common/connection.py (modified) (1 diff)
• src/gajim.py (modified) (3 diffs)
• src/message_control.py (modified) (2 diffs)
• src/otr_windows.py (modified) (5 diffs)
• src/roster_window.py (modified) (1 diff)

trunk/config.h.in

@@ -64 +64 @@
 #undef HAVE_UNISTD_H
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Name of package */
 #undef PACKAGE

trunk/src/chat_control.py

@@ -1209 +1209 @@
         def update_otr(self, print_status=False):
                 # retrieve the OTR context from the chat's contact data
-                ctx = gajim.otr_module.otrl_context_find(gajim.otr_userstates[self.account],
+                ctx = gajim.otr_module.otrl_context_find(gajim.connections[self.account].otr_userstates,
                         self.contact.get_full_jid().encode(),
                         gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO, 1,
@@ -1852 +1852 @@
                         self.handlers[id] = smp_otr_menuitem
 
-                        ctx = gajim.otr_module.otrl_context_find(gajim.otr_userstates[self.account],
+                        ctx = gajim.otr_module.otrl_context_find(gajim.connections[self.account].otr_userstates,
                                 self.contact.get_full_jid().encode(),
                                 gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO, 1,
@@ -2350 +2350 @@
         def _on_end_otr_menuitem_activate(self, widget):
                 fjid = self.contact.get_full_jid()
-                gajim.otr_module.otrl_message_disconnect(gajim.otr_userstates[self.account],
+                gajim.otr_module.otrl_message_disconnect(gajim.connections[self.account].otr_userstates,
                                 (gajim.otr_ui_ops, {'account':self.account,'urgent':True}),
                                 gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO,
@@ -2360 +2360 @@
                 gajim.otr_windows.ContactOtrWindow(self.contact, self.account, self)
         def _on_smp_otr_menuitem_activate(self, widget):
-                ctx = gajim.otr_module.otrl_context_find(gajim.otr_userstates[self.account],
+                ctx = gajim.otr_module.otrl_context_find(gajim.connections[self.account].otr_userstates,
                         self.contact.get_full_jid().encode(),
                         gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO, 1,

trunk/src/common/connection_handlers.py

@@ -1681 +1681 @@
                         if gajim.otr_module and isinstance(msgtxt, unicode):
                                 otr_msg_tuple = gajim.otr_module.otrl_message_receiving(
-                                        gajim.otr_userstates[self.name],
+                                        gajim.connections[self.name].otr_userstates,
                                         (gajim.otr_ui_ops, {'account':self.name}),
                                         gajim.get_jid_from_account(self.name).encode(),
@@ -1700 +1700 @@
                                                 ctrl.update_ui()
 
-                                ctx = gajim.otr_module.otrl_context_find(gajim.otr_userstates[self.name], frm.encode(),
+                                ctx = gajim.otr_module.otrl_context_find(gajim.connections[self.name].otr_userstates, frm.encode(),
                                                 gajim.get_jid_from_account(self.name).encode(), gajim.OTR_PROTO, 1,
                                                 (gajim.otr_add_appdata, self.name))[0]

trunk/src/common/connection.py

@@ -165 +165 @@
                 self.vcard_supported = True
                 self.private_storage_supported = True
+
+                if gajim.otr_module:
+                        self.otr_userstates = gajim.otr_module.otrl_userstate_create()
+
+                        try:
+                                gajim.otr_module.otrl_privkey_read(self.otr_userstates,
+                                        os.path.join(gajimpaths.root,
+                                        '%s.key' % self.name).encode())
+                        except Exception, e:
+                                if hasattr(e, 'os_errno') and e.os_errno == 2:
+                                        pass
+
+                        try:
+                                gajim.otr_module.otrl_privkey_read_fingerprints(
+                                        self.otr_userstates, os.path.join(
+                                        gajimpaths.root, '%s.fpr' % self.name
+                                        ).encode(), (add_appdata, a))
+                        except Exception, e:
+                                if hasattr(e, 'os_errno') and e.os_errno == 2:
+                                        pass
         # END __init__
 

trunk/src/gajim.py

@@ -320 +320 @@
                         gtk.main_iteration(block=False)
 
-                otr.otrl_privkey_generate(gajim.otr_userstates[opdata['account']],
+                otr.otrl_privkey_generate(gajim.connections[opdata['account']].otr_userstates,
                         os.path.join(gajimpaths.root, "%s.key"%opdata['account']).encode(),
                         accountname, gajim.OTR_PROTO)
@@ -372 +372 @@
 
         def write_fingerprints(self, opdata=""):
-                otr.otrl_privkey_write_fingerprints(gajim.otr_userstates[opdata['account']],
+                otr.otrl_privkey_write_fingerprints(gajim.connections[opdata['account']].otr_userstates,
                         os.path.join(gajimpaths.root, "%s.fpr"%opdata['account']).encode())
 
@@ -3327 +3327 @@
                         gajim.transport_avatar[a] = {}
 
-                        if gajim.otr_module:
-                                gajim.otr_userstates[a] = otr.otrl_userstate_create()
-                                try:
-                                        otr.otrl_privkey_read(gajim.otr_userstates[a],
-                                                os.path.join(gajimpaths.root, "%s.key"%a).encode())
-                                except Exception, e:
-                                        if hasattr(e,"os_errno") and e.os_errno == 2:
-                                                print "didn't find otr keyfile "+ \
-                                                        (os.path.join(gajimpaths.root, "%s.key"%a).encode())
-                                                pass
-                                try:
-                                        otr.otrl_privkey_read_fingerprints(gajim.otr_userstates[a],
-                                                os.path.join(gajimpaths.root, "%s.fpr"%a).encode(), (add_appdata, a))
-                                except Exception, e:
-                                        if hasattr(e,"os_errno") and e.os_errno == 2:
-                                                print "didn't find otr fingerprint file "+ \
-                                                        (os.path.join(gajimpaths.root, "%s.fpr"%a).encode())
-                                                pass
-
                 if gajim.config.get('remote_control'):
                         try:

trunk/src/message_control.py

@@ -161 +161 @@
         
                                 new_msg = gajim.otr_module.otrl_message_sending(
-                                        gajim.otr_userstates[self.account],
+                                        gajim.connections[self.account].otr_userstates,
                                         (gajim.otr_ui_ops, d),
                                         gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO,
@@ -167 +167 @@
 
                                 context = gajim.otr_module.otrl_context_find(
-                                                gajim.otr_userstates[self.account],
+                                                gajim.connections[self.account].otr_userstates,
                                                 self.contact.get_full_jid().encode(),
                                                 gajim.get_jid_from_account(self.account).encode(),
                                                 gajim.OTR_PROTO, 1)[0]
-
-                                print repr(context.accountname), repr(context.username)
 
                                 # we send all because inject_message can filter on HTML stuff then

trunk/src/otr_windows.py

@@ -50 +50 @@
 
                 self.ctx = gajim.otr_module.otrl_context_find(
-                        gajim.otr_userstates[self.account],
+                        gajim.connections[self.account].otr_userstates,
                         self.fjid.encode(), gajim.get_jid_from_account(self.account).encode(),
                         gajim.OTR_PROTO, 1, (gajim.otr_add_appdata, self.account))[0]
@@ -80 +80 @@
         def _abort(self, text=None):
                 self.smp_running = False
-                gajim.otr_module.otrl_message_abort_smp(gajim.otr_userstates[self.account],
+                gajim.otr_module.otrl_message_abort_smp(gajim.connections[self.account].otr_userstates,
                                 (gajim.otr_ui_ops, {'account':self.account}), self.ctx)
                 if text:
@@ -153 +153 @@
                 secret = self.gw("secret_entry").get_text()
                 if self.response:
-                        gajim.otr_module.otrl_message_respond_smp(gajim.otr_userstates[self.account],
+                        gajim.otr_module.otrl_message_respond_smp(gajim.connections[self.account].otr_userstates,
                                         (gajim.otr_ui_ops, {'account':self.account}), self.ctx, secret)
                 else:
-                        gajim.otr_module.otrl_message_initiate_smp(gajim.otr_userstates[self.account],
+                        gajim.otr_module.otrl_message_initiate_smp(gajim.connections[self.account].otr_userstates,
                                         (gajim.otr_ui_ops, {'account':self.account}), self.ctx, secret)
                         self.gw("progressbar").set_fraction(0.3)
@@ -175 +175 @@
 
                 self.ctx = gajim.otr_module.otrl_context_find(
-                        gajim.otr_userstates[self.account],
+                        gajim.connections[self.account].otr_userstates,
                         self.contact.get_full_jid().encode(),
                         gajim.get_jid_from_account(self.account).encode(),
@@ -194 +194 @@
                 self.gw("our_fp_label").set_markup(our_fp_text%
                         gajim.otr_module.otrl_privkey_fingerprint(
-                                gajim.otr_userstates[self.account],
+                                gajim.connections[self.account].otr_userstates,
                                 gajim.get_jid_from_account(self.account).encode(),
                                 gajim.OTR_PROTO))

trunk/src/roster_window.py

@@ -1777 +1777 @@
                                 # offline/invisible
                                 if status == 'offline' or status == 'invisible':
-                                        ctx = gajim.otr_userstates[account].context_root
+                                        ctx = gajim.connections[account].otr_userstates.context_root
                                         while ctx is not None:
                                                 if ctx.msgstate == gajim.otr_module.OTRL_MSGSTATE_ENCRYPTED:
                                                         disconnected = True
-                                                        gajim.otr_module.otrl_message_disconnect(gajim.otr_userstates[account],
+                                                        gajim.otr_module.otrl_message_disconnect(gajim.connections[account].otr_userstates,
                                                                         (gajim.otr_ui_ops,
                                                                         {'account':account,'urgent':True}), ctx.accountname,