Changeset 5f40da7 for irc_im.c

Timestamp:

2011-12-26T10:51:19Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (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:

Merging oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

File:

• irc_im.c (modified) (2 diffs)

irc_im.c

@@ -442 +442 @@
 {
         irc_user_t *iu = data;
-        char *msg = g_string_free( iu->pastebuf, FALSE );
+        char *msg;
         GSList *l;
+        
+        msg = g_string_free( iu->pastebuf, FALSE );
+        iu->pastebuf = NULL;
+        iu->pastebuf_timer = 0;
         
         for( l = irc_plugins; l; l = l->next )
@@ -470 +474 @@
         
         g_free( msg );
-        iu->pastebuf = NULL;
-        iu->pastebuf_timer = 0;
         
         return FALSE;