Changeset 5bf5edf

Timestamp:

2008-02-10T21:54:28Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

2a2db6f

Parents:

5d62040

Message:

log out all accounts when going into keygen

Files:

• otr.c (modified) (3 diffs)
• root_commands.c (modified) (2 diffs)

otr.c

@@ -124 +124 @@
 /* show the list of fingerprints associated with a given context */
 void show_fingerprints(irc_t *irc, ConnContext *ctx);
+
+/* to log out accounts during keygen */
+extern void cmd_account(irc_t *irc, char **cmd);
 
 
@@ -1122 +1125 @@
 void otr_keygen(irc_t *irc, const char *handle, const char *protocol)
 {
+        char *account_off[] = {"account", "off", NULL};
         GError *err;
         GThread *thr;
         struct kgdata *kg;
         gint ev;
-        
-        irc_usermsg(irc, "generating new otr privkey for %s/%s...",
-                handle, protocol);
         
         kg = g_new0(struct kgdata, 1);
@@ -1167 +1168 @@
         }
 
+        /* tell the user what's happening, go comatose, and start the keygen */
+        irc_usermsg(irc, "going comatose for otr key generation, this will take a moment");
+        irc_usermsg(irc, "all accounts logging out, user commands disabled");
+        cmd_account(irc, account_off);
+        irc_usermsg(irc, "generating new otr privkey for %s/%s...",
+                handle, protocol);
+        
         thr = g_thread_create(&otr_keygen_thread_func, kg, FALSE, &err);
         if(!thr) {

root_commands.c

@@ -136 +136 @@
 }
 
-static void cmd_account( irc_t *irc, char **cmd );
+void cmd_account( irc_t *irc, char **cmd );
 
 static void cmd_identify( irc_t *irc, char **cmd )
@@ -213 +213 @@
 }
 
-static void cmd_account( irc_t *irc, char **cmd )
+void cmd_account( irc_t *irc, char **cmd )
 {
         account_t *a;