Changeset 29ff5c2 for protocols/oscar/oscar.c

Timestamp:

2015-11-21T00:01:50Z (8 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (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 feat/hip-cat

File:

• protocols/oscar/oscar.c (modified) (5 diffs)

protocols/oscar/oscar.c

@@ -456 +456 @@
                         b_event_remove(n->inpa);
                 }
+                n->inpa = 0;
                 g_free(n->name);
                 g_free(n->show);
@@ -481 +482 @@
         if (ic->inpa > 0) {
                 b_event_remove(ic->inpa);
+                ic->inpa = 0;
         }
         if (odata->cnpa > 0) {
                 b_event_remove(odata->cnpa);
+                odata->cnpa = 0;
         }
         if (odata->paspa > 0) {
                 b_event_remove(odata->paspa);
+                odata->paspa = 0;
         }
         aim_session_kill(odata->sess);
@@ -637 +641 @@
         aim_sendcookie(sess, bosconn, info->cookie);
         b_event_remove(ic->inpa);
+        ic->inpa = 0;
 
         return 1;
@@ -1261 +1266 @@
         } break;
 
-        case 2: {         /* rendevous */
+        case 2: {         /* rendezvous */
                 struct aim_incomingim_ch2_args *args;
                 args = va_arg(ap, struct aim_incomingim_ch2_args *);
@@ -2586 +2591 @@
         if (cc->inpa > 0) {
                 b_event_remove(cc->inpa);
+                cc->inpa = 0;
         }
         aim_conn_kill(od->sess, &cc->conn);