Ticket #53: bitlbee-recode-0.6.diff

irc.c

@@ -116 +116 @@
         set_add( irc, "buddy_sendbuffer", "false", set_eval_bool );
         set_add( irc, "buddy_sendbuffer_delay", "200", set_eval_int );
         set_add( irc, "charset", "iso8859-1", set_eval_charset );
+        set_add( irc, "oscar_recode_charset", "iso8859-1", set_eval_oscar_recode_charset );
         set_add( irc, "debug", "false", set_eval_bool );
         set_add( irc, "default_target", "root", NULL );
         set_add( irc, "display_namechanges", "false", set_eval_bool );

protocols/oscar/oscar.c

@@ -1029 +1029 @@
         return 1;
 }
 
+extern GSList *irc_connection_list;
+
 static int incomingim_chan1(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch1_args *args) {
+        char *src="";
         char *tmp = g_malloc(BUF_LONG + 1);
         struct gaim_connection *gc = sess->aux_data;
         int flags = 0;
@@ -1038 +1041 @@
                 flags |= IM_FLAG_AWAY;
         
         if ((args->icbmflags & AIM_IMFLAGS_UNICODE) || (args->icbmflags & AIM_IMFLAGS_ISO_8859_1)) {
-                char *src;
                 
                 if (args->icbmflags & AIM_IMFLAGS_UNICODE)
                         src = "UNICODEBIG";
                 else
-                        src = "ISO8859-1";
+                {
+                        char *cs;
+                        irc_t *irc = (irc_t*)irc_connection_list->data;
+                        if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                                src = cs;
+                        else
+                                src = "iso88590-1";
+                }
                 
                 /* Try to use iconv first to convert the message to UTF8 - which is what BitlBee expects */
                 if (do_iconv(src, "UTF-8", args->msg, tmp, args->msglen, BUF_LONG) >= 0) {
+                        //fprintf (stderr, "bitlbee: converted from %s to utf8!\n", src);
                         // Successfully converted!
                 } else if (args->icbmflags & AIM_IMFLAGS_UNICODE) {
                         int i;
@@ -1062 +1072 @@
                                         g_snprintf(tmp+strlen(tmp), BUF_LONG-strlen(tmp), "&#%04x;", uni);
                                 }
                         }
+                        //fprintf (stderr, "bitlbee: AIM_IMFLAGS_UNICODE, got %s!\n", tmp);
                 } else {
-                        g_snprintf(tmp, BUF_LONG, "%s", args->msg);
+                        char *cs;
+                        irc_t *irc = (irc_t*)irc_connection_list->data;
+                        if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                                src = cs;
+                        else
+                                src = "iso88590-1";
+                        if (do_iconv(src, "UTF-8", args->msg, tmp, args->msglen, BUF_LONG) < 0) {
+                                g_snprintf(tmp, BUF_LONG, "[1%s]%s", src, args->msg);
+                        }
+                        //fprintf (stderr, "bitlbee: not utf8, nor unicode, got %s!\n", tmp);
                 }
-        } else
-                g_snprintf(tmp, BUF_LONG, "%s", args->msg);
-        
+        } else {
+                char *cs;
+                irc_t *irc = (irc_t*)irc_connection_list->data;
+                if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                        src = cs;
+                else
+                        src = "iso88590-1";
+                if (do_iconv(src, "UTF-8", args->msg, tmp, args->msglen, BUF_LONG) < 0) {
+                        g_snprintf(tmp, BUF_LONG, "[2%s]%s", src, args->msg);
+                }
+                //fprintf (stderr, "bitlbee: unknown charset, got %s!\n", tmp);
+        }
+
         strip_linefeed(tmp);
         serv_got_im(gc, userinfo->sn, tmp, flags, time(NULL), -1);
         g_free(tmp);
@@ -1163 +1193 @@
         switch (args->type) {
                 case 0x0001: { /* An almost-normal instant message.  Mac ICQ sends this.  It's peculiar. */
                         char *uin, *message;
+                        char *src = "";
+                        char *cs;
+                        char *tmp = g_malloc(BUF_LONG + 1);
+                        irc_t *irc = (irc_t*)irc_connection_list->data;
+                        if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                                src = cs;
+                        else
+                                src = "iso88590-1";
                         uin = g_strdup_printf("%u", args->uin);
                         message = g_strdup(args->msg);
                         strip_linefeed(message);
-                        serv_got_im(gc, uin, message, 0, time(NULL), -1);
+                        if (do_iconv(src, "UTF-8", message, tmp, strlen (message), BUF_LONG) < 0)
+                                tmp = message;
+                        serv_got_im(gc, uin, tmp, 0, time(NULL), -1);
                         g_free(uin);
                         g_free(message);
+                        g_free (tmp);
                 } break;
 
                 case 0x0004: { /* Someone sent you a URL */
@@ -1768 +1809 @@
                         char sender[32];
                         char *dialog_msg = g_strdup(msg->msg);
                         time_t t = get_time(msg->year, msg->month, msg->day, msg->hour, msg->minute, 0);
+                        char *tmp = g_malloc(BUF_LONG + 1);
+                        char *src = "";
+                        char *cs;
+                        irc_t *irc = (irc_t*)irc_connection_list->data;
+                        if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                                src = cs;
+                        else
+                                src = "iso88590-1";
                         g_snprintf(sender, sizeof(sender), "%u", msg->sender);
                         strip_linefeed(dialog_msg);
-                        serv_got_im(gc, sender, dialog_msg, 0, t, -1);
+                        if (do_iconv(src, "UTF-8", dialog_msg, tmp, strlen (msg->msg), BUF_LONG) < 0)
+                                tmp = dialog_msg;
+                        fprintf (stderr, "bitlbee: offlinemsg, got %s\n", tmp);
+                        serv_got_im(gc, sender, tmp, 0, t, -1);
+                        if (dialog_msg != tmp)
+                                g_free (tmp);
                         g_free(dialog_msg);
                 } break;
 
@@ -1838 +1892 @@
         } else {
                 struct aim_sendimext_args args;
                 char *s;
+                char *cs;
+                char *src="";
+                irc_t *irc = (irc_t*)irc_connection_list->data;
+                if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                        src = cs;
+                else
+                        src = "iso88590-1";
+
                 
                 args.flags = AIM_IMFLAGS_ACK;
                 if (odata->icq)
@@ -1851 +1913 @@
                         s = g_malloc(BUF_LONG);
                         /* Try if we can put it in an ISO8859-1 string first.
                            If we can't, fall back to UTF16. */
-                        if ((ret = do_iconv("UTF-8", "ISO8859-1", message, s, len, BUF_LONG)) >= 0) {
+                        if ((ret = do_iconv("UTF-8", src, message, s, len, BUF_LONG)) >= 0) {
                                 args.flags |= AIM_IMFLAGS_ISO_8859_1;
                                 len = ret;
                         } else if ((ret = do_iconv("UTF-8", "UNICODEBIG", message, s, len, BUF_LONG)) >= 0) {
@@ -2248 +2310 @@
         return m;
 }
 
+char *translatestr (char *x, char *tmp)
+{
+        char *src, *cs;
+        irc_t *irc;
+        irc = (irc_t*)irc_connection_list->data;
+        if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                src = cs;
+        else
+                src = "iso88590-1";
+
+        return (do_iconv(src, "UTF-8", x, tmp, strlen (x), BUF_LONG) >= 0) ? tmp : x;
+}
+
 static int gaim_icqinfo(aim_session_t *sess, aim_frame_t *fr, ...)
 {
         struct gaim_connection *gc = sess->aux_data;
@@ -2255 +2330 @@
         GString *str;
         va_list ap;
         struct aim_icq_info *info;
-
+                char tmp[BUF_LONG];
         va_start(ap, fr);
         info = va_arg(ap, struct aim_icq_info *);
         va_end(ap);
@@ -2263 +2338 @@
         if (!info->uin)
                 return 0;
 
+                // recode into oscar_recode_charset
+
+#define translate(x) translatestr(x,tmp)
+                
         str = g_string_sized_new(100);
         g_snprintf(who, sizeof(who), "%u", info->uin);
 
         g_string_sprintfa(str, "%s: %s - %s: %s", _("UIN"), who, _("Nick"), 
-                                info->nick ? info->nick : "-");
-        info_string_append(str, "\n", _("First Name"), info->first);
-        info_string_append(str, "\n", _("Last Name"), info->last);
+                                info->nick ? translate (info->nick) : "-");
+
+
+        info_string_append(str, "\n", _("First Name"), translate (info->first));
+        info_string_append(str, "\n", _("Last Name"), translate (info->last));
                 info_string_append(str, "\n", _("Email Address"), info->email);
         if (info->numaddresses && info->email2) {
                 int i;
@@ -2296 +2377 @@
                 info_string_append(str, "\n", _("Personal Web Page"), info->personalwebpage);
         if (info->info && info->info[0]) {
                 g_string_sprintfa(str, "\n%s:\n%s\n%s", _("Additional Information"), 
-                                                info->info, _("End of Additional Information"));
+                                                translate (info->info), _("End of Additional Information"));
         }
         g_string_sprintfa(str, "\n");
         if ((info->homeaddr && (info->homeaddr[0])) || (info->homecity && info->homecity[0]) || (info->homestate && info->homestate[0]) || (info->homezip && info->homezip[0])) {

util.c

@@ -453 +453 @@
         iconv_close( cd );
         return( value );
 }
+
+char *set_eval_oscar_recode_charset( irc_t *irc, set_t *set, char *value )
+{
+        iconv_t cd;
+
+        if ( g_strncasecmp( value, "none", 4 ) == 0 )
+                return( value );
+
+        cd = iconv_open( "UTF-8", value );
+        if( cd == (iconv_t) -1 )
+                return( NULL );
+
+        iconv_close( cd );
+        return( value );
+}

util.h

@@ -46 +46 @@
 
 G_MODULE_EXPORT signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf );
 char *set_eval_charset( irc_t *irc, set_t *set, char *value );
+char *set_eval_oscar_recode_charset( irc_t *irc, set_t *set, char *value );
 
 #endif