[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.104,1.105

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory usw-pr-cvs1:/tmp/cvs-serv2492/src/protocols/irc

Modified Files:
	irc.c 
Log Message:
from Jonas Birme' (birme):
* CTCP PING now calculates with usec.
* Some minor code cleanup.

from Ethan Blanton (eblanton):
 This adds another option to IRC on a per-account basis
that specifies the encoding one wishes to use for
non-ASCII text. Like most of my recent patches,
send-path is not well tested but receive path appears
correct.

With this patch, accented chars/etc. should work
properly again over IRC. In addition, even IRC users
in different locales should be able to communicate
using non-ASCII character sets. :-)


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- irc.c	18 Oct 2002 02:13:10 -0000	1.104
+++ irc.c	19 Oct 2002 05:04:58 -0000	1.105
@@ -55,20 +55,13 @@
 
 #define USEROPT_SERV      0
 #define USEROPT_PORT      1
+#define USEROPT_CHARSET   2
 
 /* for win32 compatability */
 G_MODULE_IMPORT GSList *connections;
 
 
-static void irc_start_chat(struct gaim_connection *gc, char *who);
-static void irc_ctcp_clientinfo(struct gaim_connection *gc, char *who);
[...1333 lines suppressed...]
@@ -2488,11 +2706,18 @@
 	puo->pos = USEROPT_PORT;
 	ret->user_opts = g_list_append(ret->user_opts, puo);
 
+	puo = g_new0(struct proto_user_opt, 1);
+	puo->label = g_strdup("Encoding:");
+	puo->def = g_strdup("ISO-8859-1");
+	puo->pos = USEROPT_CHARSET;
+	ret->user_opts = g_list_append(ret->user_opts, puo);
+	
 	my_protocol = ret;
 }
 
 #ifndef STATIC
-G_MODULE_EXPORT void gaim_prpl_init(struct prpl* prpl)
+G_MODULE_EXPORT void 
+gaim_prpl_init(struct prpl* prpl)
 {
 	irc_init(prpl);
 	prpl->plug->desc.api_version = PLUGIN_API_VERSION;