Changes in irc.c [c1826c6:d990997]

File:

• irc.c (modified) (4 diffs)

irc.c

@@ -151 +151 @@
 }
 
-void irc_abort( irc_t *irc )
-{
-        irc->status = USTATUS_SHUTDOWN;
-        if( irc->sendbuffer )
-        {
-                g_source_remove( irc->r_watch_source_id );
-                irc->r_watch_source_id = g_timeout_add_full( G_PRIORITY_HIGH, 1000, (GSourceFunc) irc_free, irc, NULL );
-        }
-        else
-        {
-                irc_free( irc );
-        }
-}
-
 static gboolean irc_free_userhash( gpointer key, gpointer value, gpointer data )
 {
@@ -173 +159 @@
 
 /* Because we have no garbage collection, this is quite annoying */
-void irc_free( irc_t * irc )
+void irc_free(irc_t * irc)
 {
         account_t *account, *accounttmp;
@@ -510 +496 @@
         {
                 irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
-                /* g_io_channel_close( irc->io_channel ); */
+                g_io_channel_close( irc->io_channel );
                 return( 0 );
         }
@@ -1173 +1159 @@
                 }
                 irc_reply( irc, 376, ":End of MOTD" );
-                closesocket( fd );
+                close( fd );
         }
 }