Changeset 1522faf for protocols/nogaim.c

Timestamp:

2015-04-06T02:26:44Z (9 years ago)

Author:

dequis <dx@…>

Children:

d16e951

Parents:

71f87ba (diff), 69982f8 (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.

git-author:

dequis <dx@…> (06-04-15 02:24:35)

git-committer:

dequis <dx@…> (06-04-15 02:26:44)

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

irc_im.c
protocols/jabber/conference.c

File:

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

protocols/nogaim.c

@@ -498 +498 @@
 };
 
-static void imcb_ask_auth_cb_no(void *data)
+static void imcb_ask_cb_free(void *data)
 {
         struct imcb_ask_cb_data *cbd = data;
-
-        cbd->ic->acc->prpl->auth_deny(cbd->ic, cbd->handle);
 
         g_free(cbd->handle);
@@ -508 +506 @@
 }
 
+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);
+
+        imcb_ask_cb_free(cbd);
+}
+
 static void imcb_ask_auth_cb_yes(void *data)
 {
@@ -514 +521 @@
         cbd->ic->acc->prpl->auth_allow(cbd->ic, cbd->handle);
 
-        g_free(cbd->handle);
-        g_free(cbd);
+        imcb_ask_cb_free(cbd);
 }
 
@@ -535 +541 @@
         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, g_free, data);
-}
-
-
-static void imcb_ask_add_cb_no(void *data)
-{
-        g_free(((struct imcb_ask_cb_data*) data)->handle);
-        g_free(data);
+                  imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, imcb_ask_cb_free, data);
+
+        g_free(s);
 }
 
@@ -551 +552 @@
         cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL);
 
-        imcb_ask_add_cb_no(data);
+        imcb_ask_cb_free(data);
 }
 
 void imcb_ask_add(struct im_connection *ic, const char *handle, const char *realname)
 {
-        struct imcb_ask_cb_data *data = g_new0(struct imcb_ask_cb_data, 1);
+        struct imcb_ask_cb_data *data;
         char *s;
 
@@ -564 +565 @@
         }
 
+        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);
 
@@ -569 +572 @@
         data->handle = g_strdup(handle);
         query_add((irc_t *) ic->bee->ui_data, ic, s,
-                  imcb_ask_add_cb_yes, imcb_ask_add_cb_no, g_free, data);
+                  imcb_ask_add_cb_yes, imcb_ask_cb_free, imcb_ask_cb_free, data);
+
+        g_free(s);
 }