Changes in protocols/nogaim.c [098a75b:66aefeb]

File:

• protocols/nogaim.c (modified) (8 diffs)

protocols/nogaim.c

@@ -132 +132 @@
         extern void twitter_initmodule();
         extern void purple_initmodule();
+        extern void rpc_initmodule();
 
 #ifdef WITH_MSN
@@ -155 +156 @@
 #ifdef WITH_PURPLE
         purple_initmodule();
+#endif
+
+#ifdef WITH_RPC
+        rpc_initmodule();
 #endif
 
@@ -498 +503 @@
 };
 
-static void imcb_ask_cb_free(void *data)
+static void imcb_ask_auth_cb_no(void *data)
 {
         struct imcb_ask_cb_data *cbd = data;
+
+        cbd->ic->acc->prpl->auth_deny(cbd->ic, cbd->handle);
 
         g_free(cbd->handle);
@@ -506 +513 @@
 }
 
-static void imcb_ask_auth_cb_no(void *data)
+static void imcb_ask_auth_cb_yes(void *data)
 {
         struct imcb_ask_cb_data *cbd = data;
 
-        cbd->ic->acc->prpl->auth_deny(cbd->ic, cbd->handle);
-
-        imcb_ask_cb_free(cbd);
-}
-
-static void imcb_ask_auth_cb_yes(void *data)
-{
-        struct imcb_ask_cb_data *cbd = data;
-
         cbd->ic->acc->prpl->auth_allow(cbd->ic, cbd->handle);
 
-        imcb_ask_cb_free(cbd);
+        g_free(cbd->handle);
+        g_free(cbd);
 }
 
@@ -541 +540 @@
         data->handle = g_strdup(handle);
         query_add((irc_t *) ic->bee->ui_data, ic, s,
-                  imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, imcb_ask_cb_free, data);
-
-        g_free(s);
+                  imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, g_free, data);
+}
+
+
+static void imcb_ask_add_cb_no(void *data)
+{
+        g_free(((struct imcb_ask_cb_data*) data)->handle);
+        g_free(data);
 }
 
@@ -552 +556 @@
         cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL);
 
-        imcb_ask_cb_free(data);
+        imcb_ask_add_cb_no(data);
 }
 
 void imcb_ask_add(struct im_connection *ic, const char *handle, const char *realname)
 {
-        struct imcb_ask_cb_data *data;
+        struct imcb_ask_cb_data *data = g_new0(struct imcb_ask_cb_data, 1);
         char *s;
 
@@ -565 +569 @@
         }
 
-        data = g_new0(struct imcb_ask_cb_data, 1);
-
         s = g_strdup_printf("The user %s is not in your buddy list yet. Do you want to add him/her now?", handle);
 
@@ -572 +574 @@
         data->handle = g_strdup(handle);
         query_add((irc_t *) ic->bee->ui_data, ic, s,
-                  imcb_ask_add_cb_yes, imcb_ask_cb_free, imcb_ask_cb_free, data);
-
-        g_free(s);
+                  imcb_ask_add_cb_yes, imcb_ask_add_cb_no, g_free, data);
 }