Changes in irc.c [9c62a7c:7b23afd]

File:

• irc.c (modified) (4 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 );
         }
         
@@ -643 +637 @@
                 }
         }
+        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 )
         {
@@ -1153 +1153 @@
                 if( u->gc )
                         irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->gc->user->username,
-                                   *u->gc->user->proto_opt[0] ? u->gc->user->proto_opt[0] : "", proto_name[u->gc->user->protocol] );
+                                   *u->gc->user->proto_opt[0] ? u->gc->user->proto_opt[0] : "", u->gc->prpl->name );
                 else
                         irc_reply( irc, 312, "%s %s :%s", u->nick, irc->myhost, IRCD_INFO );