Changeset b135438 for irc.c

Timestamp:

2005-11-15T13:20:27Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

c998255, f56c491

Parents:

f7f3ada (diff), c1ede6e8 (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 changes from Wilmer

File:

• irc.c (modified) (3 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 )
         {