Changes in irc.c [bdda9e9:1186382]

File:

• irc.c (modified) (7 diffs)

irc.c

@@ -132 +132 @@
         set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc );
         set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
-        set_add( &irc->set, "charset", "iso8859-1", set_eval_charset, irc );
+        set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc );
         set_add( &irc->set, "debug", "false", set_eval_bool, irc );
         set_add( &irc->set, "default_target", "root", NULL, irc );
@@ -143 +143 @@
         set_add( &irc->set, "query_order", "lifo", NULL, irc );
         set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
+        set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
         set_add( &irc->set, "strip_html", "true", NULL, irc );
         set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
@@ -658 +659 @@
                 }
         }
-        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
+        else if( ( c = chat_by_channel( channel ) ) )
         {
                 GList *l;
@@ -811 +812 @@
         else
         {
-                struct groupchat *c = irc_chat_by_channel( irc, channel );
+                struct groupchat *c = chat_by_channel( channel );
                 
                 if( c )
@@ -910 +911 @@
         char reason[128];
         
-        if( u->ic && u->ic->flags & OPT_LOGGING_OUT )
+        if( u->ic && u->ic->flags & OPT_LOGGING_OUT && set_getbool( &irc->set, "simulate_netsplit" ) )
         {
                 if( u->ic->acc->server )
@@ -949 +950 @@
         if( *nick == '#' || *nick == '&' )
         {
-                if( !( c = irc_chat_by_channel( irc, nick ) ) )
+                if( !( c = chat_by_channel( nick ) ) )
                 {
                         irc_reply( irc, 403, "%s :Channel does not exist", nick );
@@ -1215 +1216 @@
         return TRUE;
 }
-
-struct groupchat *irc_chat_by_channel( irc_t *irc, char *channel )
-{
-        struct groupchat *c;
-        account_t *a;
-        
-        /* This finds the connection which has a conversation which belongs to this channel */
-        for( a = irc->accounts; a; a = a->next )
-        {
-                if( a->ic == NULL )
-                        continue;
-                
-                c = a->ic->groupchats;
-                while( c )
-                {
-                        if( c->channel && g_strcasecmp( c->channel, channel ) == 0 )
-                                return c;
-                        
-                        c = c->next;
-                }
-        }
-        
-        return NULL;
-}