# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1225566442 0
# Node ID ca7b726c883162aaa7dd081da629160806f6d4a8
# Parent  d9a50381a20c7d9c6676048aef5c66942c52256c# Parent  28dd3f379639b01daf999d527eeb0cd2cfdfc527
merge of '8ed01adf0c9173501da81537854ce2954e9805e7'
     and 'd5e8d63bd0bb69016447e0b053ea96ead0f57504'

diff -r d9a50381a20c -r ca7b726c8831 COPYRIGHT
--- a/COPYRIGHT	Sat Nov 01 19:05:37 2008 +0000
+++ b/COPYRIGHT	Sat Nov 01 19:07:22 2008 +0000
@@ -287,6 +287,7 @@
 Christopher O'Brien (siege)
 Peter O'Gorman
 Jon Oberheide
+Marcos García Ochoa
 Yusuke Odate
 Ruediger Oertel
 Gudmundur Bjarni Olafsson
diff -r d9a50381a20c -r ca7b726c8831 libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c	Sat Nov 01 19:05:37 2008 +0000
+++ b/libpurple/protocols/irc/irc.c	Sat Nov 01 19:07:22 2008 +0000
@@ -62,8 +62,6 @@
 
 PurplePlugin *_irc_plugin = NULL;
 
-static const char *status_chars = "@+%&";
-
 static void irc_view_motd(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
@@ -518,10 +516,7 @@
 	char *plain;
 	const char *args[2];
 
-	if (strchr(status_chars, *who) != NULL)
-		args[0] = who + 1;
-	else
-		args[0] = who;
+	args[0] = irc_nick_skip_mode(irc, who);
 
 	purple_markup_html_to_xhtml(what, NULL, &plain);
 	args[1] = plain;
diff -r d9a50381a20c -r ca7b726c8831 libpurple/protocols/irc/irc.h
--- a/libpurple/protocols/irc/irc.h	Sat Nov 01 19:05:37 2008 +0000
+++ b/libpurple/protocols/irc/irc.h	Sat Nov 01 19:07:22 2008 +0000
@@ -109,6 +109,8 @@
 char *irc_mirc2html(const char *string);
 char *irc_mirc2txt(const char *string);
 
+const char *irc_nick_skip_mode(struct irc_conn *irc, const char *string);
+
 gboolean irc_ischannel(const char *string);
 
 void irc_register_commands(void);
diff -r d9a50381a20c -r ca7b726c8831 libpurple/protocols/irc/parse.c
--- a/libpurple/protocols/irc/parse.c	Sat Nov 01 19:05:37 2008 +0000
+++ b/libpurple/protocols/irc/parse.c	Sat Nov 01 19:07:22 2008 +0000
@@ -497,6 +497,19 @@
         return result;
 }
 
+const char *irc_nick_skip_mode(struct irc_conn *irc, const char *nick)
+{
+	static const char *default_modes = "@+%&";
+	const char *mode_chars;
+
+	mode_chars = irc->mode_chars ? irc->mode_chars : default_modes;
+
+	while (strchr(mode_chars, *nick) != NULL)
+		nick++;
+
+	return nick;
+}
+
 gboolean irc_ischannel(const char *string)
 {
 	return (string[0] == '#' || string[0] == '&');
diff -r d9a50381a20c -r ca7b726c8831 libpurple/protocols/qq/buddy_info.c
--- a/libpurple/protocols/qq/buddy_info.c	Sat Nov 01 19:05:37 2008 +0000
+++ b/libpurple/protocols/qq/buddy_info.c	Sat Nov 01 19:07:22 2008 +0000
@@ -69,9 +69,9 @@
 };
 
 static const gchar *genders_zh[] = {
-	N_("-"),
-	N_("\xc4\xd0"),
-	N_("\xc5\xae"),
+	"-",
+	"\xc4\xd0",
+	"\xc5\xae",
 };
 
 #define QQ_FACES	    134
diff -r d9a50381a20c -r ca7b726c8831 po/POTFILES.in
--- a/po/POTFILES.in	Sat Nov 01 19:05:37 2008 +0000
+++ b/po/POTFILES.in	Sat Nov 01 19:07:22 2008 +0000
@@ -145,7 +145,6 @@
 libpurple/protocols/qq/qq_network.c
 libpurple/protocols/qq/qq_process.c
 libpurple/protocols/qq/send_file.c
-libpurple/protocols/qq/sys_msg.c
 libpurple/protocols/sametime/sametime.c
 libpurple/protocols/silc/buddy.c
 libpurple/protocols/silc/chat.c