Changeset 3fbce97 for protocols/yahoo/yahoo.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 branch 'master' into parson

File:

• protocols/yahoo/yahoo.c (modified) (1 diff)

protocols/yahoo/yahoo.c

@@ -440 +440 @@
 {
         struct byahoo_connect_callback_data *d = data;
-
-        if (!byahoo_get_ic_by_id(d->id)) {
+        struct im_connection *ic;
+
+        if (!(ic = byahoo_get_ic_by_id(d->id))) {
+                g_free(d);
+                return;
+        }
+
+        if (source == -1) {
+                d->callback(NULL, 0, d->data);
+                imcb_error(ic, "Could not connect to server");
+                imc_logout(ic, TRUE);
                 g_free(d);
                 return;