Changes in irc.c [2ff2076:94d52d64]

File:

• irc.c (modified) (3 diffs)

irc.c

@@ -28 +28 @@
 #include "crypting.h"
 #include "ipc.h"
-#include "dcc.h"
-
-#include <regex.h>
-#include <netinet/in.h>
 
 static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
@@ -324 +320 @@
                         }
                         
-                        if( ( cs = set_getstr( &irc->set, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                        if( ( cs = set_getstr( &irc->set, "charset" ) ) )
                         {
                                 conv[IRC_MAX_LINE] = 0;
-                                if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) != -1 )
-                                        lines[i] = conv;
+                                if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) == -1 )
+                                {
+                                        if( irc->status & USTATUS_LOGGED_IN )
+                                                irc_usermsg( irc, "ERROR: Charset mismatch detected. The charset "
+                                                                  "setting is currently set to %s, so please make "
+                                                                  "sure your IRC client will send and accept text in "
+                                                                  "that charset, or tell BitlBee which charset to "
+                                                                  "expect by changing the charset setting. See "
+                                                                  "`help set charset' for more information. Your "
+                                                                  "message was ignored.", cs );
+                                        *conv = 0;
+                                }
+                                lines[i] = conv;
                         }
                         
@@ -985 +992 @@
                         return( 1 );
                 }
-                else if( g_strncasecmp( s + 1, "DCC", 3 ) == 0 )
-                {
-                        if( u && u->ic && u->ic->acc->prpl->transfer_request )
-                        {
-                                file_transfer_t *ft = dcc_request( u->ic, s + 5 );
-                                if ( ft )
-                                        u->ic->acc->prpl->transfer_request( u->ic, ft, u->handle );
-                        }
-                        return( 1 );
-                }               
                 else
                 {
-                        irc_usermsg( irc, "Supported CTCPs are ACTION, VERSION, PING, TYPING, DCC" );
+                        irc_usermsg( irc, "Non-ACTION CTCP's aren't supported" );
                         return( 0 );
                 }