diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | russian/Makefile | 1 | ||||
| -rw-r--r-- | russian/gaim/Makefile | 18 | ||||
| -rw-r--r-- | russian/gaim/files/patch-oscar.c | 74 |
4 files changed, 1 insertions, 93 deletions
@@ -1259,3 +1259,4 @@ palm/kpilot|deskutils/kdepim3|2004-08-30|kpilot has been reintegrated into kdepi devel/calltree|devel/callgrind|2004-09-01|renamed by author sysutils/top||2004-09-02|No longer maintained sysutils/portindex||2004-09-13|Removed on maintainer's request +russian/gaim|net/gaim|2004-10-12|Functionality merged into original Gaim diff --git a/russian/Makefile b/russian/Makefile index cdb74af..24e6b4c8 100644 --- a/russian/Makefile +++ b/russian/Makefile @@ -12,7 +12,6 @@ SUBDIR += d1489 SUBDIR += elm.language SUBDIR += fortuneru - SUBDIR += gaim SUBDIR += kde3-i18n SUBDIR += koffice-i18n SUBDIR += koi2koi diff --git a/russian/gaim/Makefile b/russian/gaim/Makefile deleted file mode 100644 index 2ff094f..0000000 --- a/russian/gaim/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# New ports collection makefile for: ru-gaim -# Date created: 19 Jun 2004 -# Whom: Andrey Slusar <vasallia@ukr.net> -# -# $FreeBSD$ -# - -PORTNAME= xmms -CATEGORIES= russian - -MAINTAINER= anray@inet.ua -COMMENT= Gaim with underclared charsets support for oscar protocol - -MASTERDIR= ${.CURDIR}/../../net/gaim - -CONFLICTS= gaim-[0-9]* - -.include "${MASTERDIR}/Makefile" diff --git a/russian/gaim/files/patch-oscar.c b/russian/gaim/files/patch-oscar.c deleted file mode 100644 index 121b063..0000000 --- a/russian/gaim/files/patch-oscar.c +++ /dev/null @@ -1,74 +0,0 @@ ---- src/protocols/oscar/oscar.c.orig 2004-05-30 21:04:55.000000000 +0400 -+++ src/protocols/oscar/oscar.c 2004-06-05 22:14:22.000000000 +0400 -@@ -3019,6 +3019,7 @@ - GError *err = NULL; - struct buddyinfo *bi; - const char *iconfile; -+ char *charset; - - bi = g_hash_table_lookup(od->buddyinfo, gaim_normalize(account, userinfo->sn)); - if (!bi) { -@@ -3110,10 +3112,11 @@ - if (!args->msg || !args->msglen) - return 1; - -- tmp = g_convert(args->msg, args->msglen, "UTF-8", "ISO-8859-1", NULL, &convlen, &err); -+ charset = gaim_account_get_string(account, "plain_charset", "ISO-8859-1"); -+ tmp = g_convert(args->msg, args->msglen, "UTF-8", charset, NULL, &convlen, &err); - if (err) { -- gaim_debug_info("oscar", -- "ISO-8859-1 IM conversion: %s\n", err->message); -+ gaim_debug(GAIM_DEBUG_INFO, "oscar", -+ "%s IM conversion: %s\n", charset, err->message); - tmp = g_strdup(_("(There was an error receiving this message)")); - g_error_free(err); - } -@@ -5133,6 +5136,8 @@ - GError *err = NULL; - const char *iconfile = gaim_account_get_buddy_icon(gaim_connection_get_account(gc)); - char *tmpmsg = NULL, *tmpmsg2 = NULL; -+ GaimAccount *account = gc->account; -+ char *charset; - - if (dim && dim->connected) { - /* If we're directly connected, send a direct IM */ -@@ -5233,7 +5238,8 @@ - } - len = strlen(tmpmsg); - -- args.flags |= oscar_encoding_check(tmpmsg); -+ if(!(gaim_account_get_bool(account, "send_plain", FALSE))) -+ args.flags |= oscar_encoding_check(tmpmsg); - if (args.flags & AIM_IMFLAGS_UNICODE) { - gaim_debug_info("oscar", "Sending Unicode IM\n"); - args.charset = 0x0002; -@@ -5272,7 +5278,10 @@ - } else { - args.charset = 0x0000; - args.charsubset = 0x0000; -- args.msg = tmpmsg; -+ charset = gaim_account_get_string(account, "plain_charset", "ISO-8859-1"); -+ args.msg = g_convert(tmpmsg, len, charset, "UTF-8", NULL, &len, &err); -+ if (err) gaim_debug(GAIM_DEBUG_ERROR, "oscar", -+ "conversion error: %s\n", err->message); - } - args.msglen = len; - -@@ -7230,6 +7239,17 @@ - option = gaim_account_option_int_new(_("Auth port"), "port", 5190); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); -+ option = gaim_account_option_string_new( -+ _("Charset for plain text messages"), -+ "plain_charset", "ISO-8859-1"); -+ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, -+ option); -+ -+ option = gaim_account_option_bool_new( -+ _("Send messages in plain text"), -+ "send_plain", FALSE); -+ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, -+ option); - - my_protocol = plugin; - } |
