Changes in / [2095c57:68b50b5f]

Files:

• irc.c (modified) (3 diffs)
• protocols/oscar/aim_internal.h (modified) (1 diff)
• protocols/oscar/faimconfig.h (deleted)
• protocols/oscar/snac.c (modified) (2 diffs)

irc.c

@@ -162 +162 @@
         if( irc->w_watch_source_id > 0 )
                 g_source_remove( irc->w_watch_source_id );
-        g_io_channel_close( irc->io_channel );
+        
         g_io_channel_unref( irc->io_channel );
         irc_connection_list = g_slist_remove( irc_connection_list, irc );
@@ -462 +462 @@
                 }
                 return( 1 );
+        }
+        else if( g_strcasecmp( cmd[0], "QUIT" ) == 0 )
+        {
+                irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
+                g_io_channel_close( irc->io_channel );
+                return( 0 );
         }
         
@@ -637 +643 @@
                 }
         }
-        else if( g_strcasecmp( cmd[0], "QUIT" ) == 0 )
-        {
-                irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
-                g_io_channel_close( irc->io_channel );
-                return( 0 );
-        }
         else if( g_strcasecmp( cmd[0], "WHO" ) == 0 )
         {

protocols/oscar/aim_internal.h

@@ -107 +107 @@
 
 void aim_initsnachash(aim_session_t *sess);
-aim_snacid_t aim_newsnac(aim_session_t *, aim_snac_t *newsnac);
 aim_snacid_t aim_cachesnac(aim_session_t *sess, const guint16 family, const guint16 type, const guint16 flags, const void *data, const int datalen);
 aim_snac_t *aim_remsnac(aim_session_t *, aim_snacid_t id);

protocols/oscar/snac.c

@@ -14 +14 @@
 
 #include <aim.h>
+
+static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac);
 
 /*
@@ -51 +53 @@
  * list/hash.
  */
-aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac)
+static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac)
 {
         aim_snac_t *snac;