Changeset 6738a67 for otr.c

Timestamp:

2008-07-16T23:22:52Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

9b55485

Parents:

9730d72 (diff), 6a78c0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in latest trunk

File:

• otr.c (modified) (11 diffs)

otr.c

@@ -46 +46 @@
 #include <unistd.h>
 #include <assert.h>
+#include <signal.h>
 
 
@@ -102 +103 @@
 };
 
+typedef struct {
+        void *fst;
+        void *snd;
+} pair_t;       
+
 
 /** misc. helpers/subroutines: **/
@@ -124 +130 @@
 
 /* some yes/no handlers */
-void yes_keygen(gpointer w, void *data);
-void yes_forget_fingerprint(gpointer w, void *data);
-void yes_forget_context(gpointer w, void *data);
-void yes_forget_key(gpointer w, void *data);
+void yes_keygen(void *data);
+void yes_forget_fingerprint(void *data);
+void yes_forget_context(void *data);
+void yes_forget_key(void *data);
 
 /* helper to make sure accountname and protocol match the incoming "opdata" */
@@ -841 +847 @@
 }
 
-void yes_forget_fingerprint(gpointer w, void *data)
-{
-        irc_t *irc = (irc_t *)w;
-        Fingerprint *fp = (Fingerprint *)data;
+void yes_forget_fingerprint(void *data)
+{
+        pair_t *p = (pair_t *)data;
+        irc_t *irc = (irc_t *)p->fst;
+        Fingerprint *fp = (Fingerprint *)p->snd;
+
+        g_free(p);
         
         if(fp == fp->context->active_fingerprint) {
@@ -854 +863 @@
 }
 
-void yes_forget_context(gpointer w, void *data)
-{
-        irc_t *irc = (irc_t *)w;
-        ConnContext *ctx = (ConnContext *)data;
+void yes_forget_context(void *data)
+{
+        pair_t *p = (pair_t *)data;
+        irc_t *irc = (irc_t *)p->fst;
+        ConnContext *ctx = (ConnContext *)p->snd;
+
+        g_free(p);
         
         if(ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
@@ -870 +882 @@
 }
 
-void yes_forget_key(gpointer w, void *data)
+void yes_forget_key(void *data)
 {
         OtrlPrivKey *key = (OtrlPrivKey *)data;
@@ -889 +901 @@
                 char human[54];
                 char *s;
+                pair_t *p;
                 
                 if(!args[3]) {
@@ -922 +935 @@
                 otrl_privkey_hash_to_human(human, fp->fingerprint);
                 s = g_strdup_printf("about to forget fingerprint %s, are you sure?", human);
-                query_add(irc, NULL, s, yes_forget_fingerprint, NULL, fp);
+                p = g_malloc(sizeof(pair_t));
+                if(!p)
+                        return;
+                p->fst = irc;
+                p->snd = fp;
+                query_add(irc, NULL, s, yes_forget_fingerprint, NULL, p);
                 g_free(s);
         }
@@ -931 +949 @@
                 ConnContext *ctx;
                 char *s;
+                pair_t *p;
                 
                 /* TODO: allow context specs ("user/proto/account") in 'otr forget contex'? */
@@ -952 +971 @@
                 
                 s = g_strdup_printf("about to forget otr data about %s, are you sure?", args[2]);
-                query_add(irc, NULL, s, yes_forget_context, NULL, ctx);
+                p = g_malloc(sizeof(pair_t));
+                if(!p)
+                        return;
+                p->fst = irc;
+                p->snd = ctx;
+                query_add(irc, NULL, s, yes_forget_context, NULL, p);
                 g_free(s);
         }
@@ -1660 +1684 @@
 }
 
-void yes_keygen(gpointer w, void *data)
+void yes_keygen(void *data)
 {
         account_t *acc = (account_t *)data;