Changes in / [6e68a52:debc281]

Files:

• lib/events_glib.c (modified) (3 diffs)
• protocols/msn/sb.c (modified) (1 diff)

lib/events_glib.c

@@ -48 +48 @@
 typedef struct _GaimIOClosure {
         b_event_handler function;
+        guint result;
         gpointer data;
 } GaimIOClosure;
@@ -100 +101 @@
         GIOChannel *channel;
         GIOCondition cond = 0;
-        int st;
         
         closure->function = function;
@@ -111 +111 @@
         
         channel = g_io_channel_unix_new(source);
-        st = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
-                                 gaim_io_invoke, closure, gaim_io_destroy);
+        closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
+                                              gaim_io_invoke, closure, gaim_io_destroy);
         
-        event_debug( "b_input_add( %d, %d, 0x%x, 0x%x ) = %d (%p)\n", source, condition, function, data, st, closure );
+        event_debug( "b_input_add( %d, %d, 0x%x, 0x%x ) = %d (0x%x)\n", source, condition, function, data, closure->result, closure );
         
         g_io_channel_unref(channel);
-        return st;
+        return closure->result;
 }
 

protocols/msn/sb.c

@@ -491 +491 @@
                 }
         }
-        else if( strcmp( cmd[0], "NAK" ) == 0 )
-        {
-                if( sb->who )
-                {
-                        imcb_log( ic, "The MSN servers could not deliver one of your messages to %s.", sb->who );
-                }
-                else
-                {
-                        imcb_log( ic, "The MSN servers could not deliver one of your groupchat messages to all participants." );
-                }
-        }
         else if( strcmp( cmd[0], "BYE" ) == 0 )
         {