Mercurial > pidgin.yaz

changeset 24253:2a4f96dc074e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '0d1b60430843a092248a2644865910266131add6' and '353dca4bdccf7f7494fbffa5503b6641c0f6e758'
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 27 Oct 2008 00:58:29 +0000
parents cb0aa91430bb (current diff) b51732ec65e4 (diff)
children 70864c55e233 e54d7fff1ad2 a4dfc631b140 45dbea660309 e81b708a8986
files
diffstat 2 files changed, 74 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/server.c	Mon Oct 27 00:58:03 2008 +0000
+++ b/libpurple/server.c	Mon Oct 27 00:58:29 2008 +0000
@@ -261,14 +261,18 @@
 		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account);
 		if(conv != NULL && alias != NULL && strcmp(alias, who))
 		{
+			char *escaped = g_markup_escape_text(who, -1);
+			char *escaped2 = g_markup_escape_text(alias, -1);
 			char *tmp = g_strdup_printf(_("%s is now known as %s.\n"),
-										who, alias);
+										escaped, escaped2);
 
 			purple_conversation_write(conv, NULL, tmp,
 					PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY,
 					time(NULL));
 
 			g_free(tmp);
+			g_free(escaped2);
+			g_free(escaped);
 		}
 	}
 }
--- a/pidgin/gtkdialogs.c	Mon Oct 27 00:58:03 2008 +0000
+++ b/pidgin/gtkdialogs.c	Mon Oct 27 00:58:29 2008 +0000
@@ -69,29 +69,30 @@
 
 /* Order: Alphabetical by Last Name */
 static const struct developer developers[] = {
-	{"Daniel 'datallah' Atallah",	N_("developer"), NULL},
-	{"John 'rekkanoryo' Bailey",	N_("developer & bug master"), NULL},
-	{"Ethan 'Paco-Paco' Blanton",	N_("developer"), NULL},
-	{"Thomas Butter",				N_("developer"), NULL},
+	{"Daniel 'datallah' Atallah",	NULL, NULL},
+	{"John 'rekkanoryo' Bailey",	N_("bug master"), NULL},
+	{"Ethan 'Paco-Paco' Blanton",	NULL, NULL},
+	{"Hylke Bons",			N_("artist"), "h.bons@student.rug.nl"},
+	{"Thomas Butter",				NULL, NULL},
 	/* feel free to not translate this */
-	{N_("Ka-Hing Cheung"),			N_("developer"), NULL},
-	{"Sadrul Habib Chowdhury",		N_("developer"), NULL},
-	{"Mark 'KingAnt' Doliner",		N_("developer"), "mark@kingant.net"},
-	{"Sean Egan",					N_("developer"), "sean.egan@gmail.com"},
-	{"Casey Harkins",               N_("developer"),   NULL},
-	{"Gary 'grim' Kramlich",		N_("developer"), NULL},
-	{"Richard 'rlaager' Laager",	N_("developer"), NULL},
-	{"Richard 'wabz' Nelson",		N_("developer"), NULL},
-	{"Christopher 'siege' O'Brien", N_("developer"), "taliesein@users.sf.net"},
-	{"Bartosz Oler",		N_("developer"), NULL},
-	{"Etan 'deryni' Reisner",       N_("developer"), NULL},
-	{"Tim 'marv' Ringenbach",		N_("developer"), NULL},
-	{"Elliott 'QuLogic' Sales de Andrade",	N_("developer"),	NULL},
+	{N_("Ka-Hing Cheung"),			NULL, NULL},
+	{"Sadrul Habib Chowdhury",		NULL, NULL},
+	{"Mark 'KingAnt' Doliner",		NULL, "mark@kingant.net"},
+	{"Sean Egan",					NULL, "sean.egan@gmail.com"},
+	{"Casey Harkins",               NULL,   NULL},
+	{"Gary 'grim' Kramlich",		NULL, NULL},
+	{"Richard 'rlaager' Laager",	NULL, NULL},
+	{"Richard 'wabz' Nelson",		NULL, NULL},
+	{"Christopher 'siege' O'Brien", NULL, "taliesein@users.sf.net"},
+	{"Bartosz Oler",		NULL, NULL},
+	{"Etan 'deryni' Reisner",       NULL, NULL},
+	{"Tim 'marv' Ringenbach",		NULL, NULL},
+	{"Elliott 'QuLogic' Sales de Andrade",	NULL,	NULL},
 	{"Luke 'LSchiere' Schierer",	N_("support"), "lschiere@users.sf.net"},
-	{"Evan Schoenberg",		N_("developer"), NULL},
-	{"Kevin 'SimGuy' Stange",	N_("developer & webmaster"),	NULL},
-	{"Will 'resiak' Thompson",	N_("developer"),	NULL},
-	{"Stu 'nosnilmot' Tomlinson",	N_("developer"), NULL},
+	{"Evan Schoenberg",		NULL, NULL},
+	{"Kevin 'SimGuy' Stange",	N_("webmaster"),	NULL},
+	{"Will 'resiak' Thompson",	NULL,	NULL},
+	{"Stu 'nosnilmot' Tomlinson",	NULL, NULL},
 	{NULL, NULL, NULL}
 };
 
@@ -111,13 +112,13 @@
 	{"Jim Duchek",			N_("maintainer"), "jim@linuxpimps.com"},
 	{"Rob Flynn",			N_("maintainer"), NULL},
 	{"Adam Fritzler",		N_("libfaim maintainer"), NULL},
-	{"Christian 'ChipX86' Hammond",	N_("developer & webmaster"), NULL},
+	{"Christian 'ChipX86' Hammond",	N_("webmaster"), NULL},
 	/* If "lazy bum" translates literally into a serious insult, use something else or omit it. */
 	{"Syd Logan",			N_("hacker and designated driver [lazy bum]"), NULL},
 	{"Megan 'Cae' Schneider",       N_("support/QA"), NULL},
-	{"Jim Seymour",			N_("XMPP developer"), NULL},
+	{"Jim Seymour",			N_("XMPP"), NULL},
 	{"Mark Spencer",		N_("original author"), "markster@marko.net"},
-	{"Nathan 'faceprint' Walp",		N_("developer"), NULL},
+	{"Nathan 'faceprint' Walp",		NULL, NULL},
 	{"Eric Warmenhoven",	N_("lead developer"), "warmenhoven@yahoo.com"},
 	{NULL, NULL, NULL}
 };
@@ -285,11 +286,6 @@
 	{NULL, NULL, NULL, NULL}
 };
 
-static const struct artist artists[] = {
-	{"Hylke Bons",	"h.bons@student.rug.nl"},
-	{NULL, NULL}
-};
-
 void
 pidgin_dialogs_destroy_all()
 {
@@ -428,12 +424,17 @@
 						   _("Current Developers"));
 	for (i = 0; developers[i].name != NULL; i++) {
 		if (developers[i].email != NULL) {
-			g_string_append_printf(str, "  %s (%s) &lt;<a href=\"mailto:%s\">%s</a>&gt;<br/>",
-					_(developers[i].name), _(developers[i].role),
-					developers[i].email, developers[i].email);
+			g_string_append_printf(str, "  <a href=\"mailto:%s\">%s</a>%s%s%s<br/>",
+					developers[i].email, _(developers[i].name),
+					developers[i].role ? " (" : "",
+					developers[i].role ? _(developers[i].role) : "",
+					developers[i].role ? ")" : "");
 		} else {
-			g_string_append_printf(str, "  %s (%s)<br/>",
-					_(developers[i].name), _(developers[i].role));
+			g_string_append_printf(str, "  %s%s%s%s<br/>",
+					_(developers[i].name),
+					developers[i].role ? " (" : "",
+					developers[i].role ? _(developers[i].role) : "",
+					developers[i].role ? ")" : "");
 		}
 	}
 	g_string_append(str, "<BR/>");
@@ -443,12 +444,17 @@
 						   _("Crazy Patch Writers"));
 	for (i = 0; patch_writers[i].name != NULL; i++) {
 		if (patch_writers[i].email != NULL) {
-			g_string_append_printf(str, "  %s &lt;<a href=\"mailto:%s\">%s</a>&gt;<br/>",
-					patch_writers[i].name,
-					patch_writers[i].email, patch_writers[i].email);
+			g_string_append_printf(str, "  <a href=\"mailto:%s\">%s</a>%s%s%s<br/>",
+					patch_writers[i].email, _(patch_writers[i].name),
+					patch_writers[i].role ? " (" : "",
+					patch_writers[i].role ? _(patch_writers[i].role) : "",
+					patch_writers[i].role ? ")" : "");
 		} else {
-			g_string_append_printf(str, "  %s<br/>",
-					patch_writers[i].name);
+			g_string_append_printf(str, "  %s%s%s%s<br/>",
+					_(patch_writers[i].name),
+					patch_writers[i].role ? " (" : "",
+					patch_writers[i].role ? _(patch_writers[i].role) : "",
+					patch_writers[i].role ? ")" : "");
 		}
 	}
 	g_string_append(str, "<BR/>");
@@ -458,12 +464,17 @@
 						   _("Retired Developers"));
 	for (i = 0; retired_developers[i].name != NULL; i++) {
 		if (retired_developers[i].email != NULL) {
-			g_string_append_printf(str, "  %s (%s) &lt;<a href=\"mailto:%s\">%s</a>&gt;<br/>",
-					retired_developers[i].name, _(retired_developers[i].role),
-					retired_developers[i].email, retired_developers[i].email);
+			g_string_append_printf(str, "  <a href=\"mailto:%s\">%s</a>%s%s%s<br/>",
+					retired_developers[i].email, _(retired_developers[i].name),
+					retired_developers[i].role ? " (" : "",
+					retired_developers[i].role ? _(retired_developers[i].role) : "",
+					retired_developers[i].role ? ")" : "");
 		} else {
-			g_string_append_printf(str, "  %s (%s)<br/>",
-					retired_developers[i].name, _(retired_developers[i].role));
+			g_string_append_printf(str, "  %s%s%s%s<br/>",
+					_(retired_developers[i].name),
+					retired_developers[i].role ? " (" : "",
+					retired_developers[i].role ? _(retired_developers[i].role) : "",
+					retired_developers[i].role ? ")" : "");
 		}
 	}
 	g_string_append(str, "<BR/>");
@@ -473,42 +484,31 @@
 						   _("Retired Crazy Patch Writers"));
 	for (i = 0; retired_patch_writers[i].name != NULL; i++) {
 		if (retired_patch_writers[i].email != NULL) {
-			g_string_append_printf(str, "  %s &lt;<a href=\"mailto:%s\">%s</a>&gt;<br/>",
-					retired_patch_writers[i].name,
-					retired_patch_writers[i].email, retired_patch_writers[i].email);
+			g_string_append_printf(str, "  <a href=\"mailto:%s\">%s</a>%s%s%s<br/>",
+					retired_patch_writers[i].email, _(retired_patch_writers[i].name),
+					retired_patch_writers[i].role ? " (" : "",
+					retired_patch_writers[i].role ? _(retired_patch_writers[i].role) : "",
+					retired_patch_writers[i].role ? ")" : "");
 		} else {
-			g_string_append_printf(str, "  %s<br/>",
-					retired_patch_writers[i].name);
+			g_string_append_printf(str, "  %s%s%s%s<br/>",
+					_(retired_patch_writers[i].name),
+					retired_patch_writers[i].role ? " (" : "",
+					retired_patch_writers[i].role ? _(retired_patch_writers[i].role) : "",
+					retired_patch_writers[i].role ? ")" : "");
 		}
 	}
 	g_string_append(str, "<BR/>");
-
-	/* Artists */
-        g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
-                                                   _("Artists"));
-        for (i = 0; artists[i].name != NULL; i++) {
-        	if (artists[i].email != NULL) {
-			g_string_append_printf(str, "  %s &lt;<a href=\"mailto:%s\">%s</a>&gt;<br/>",
-			                           artists[i].name,
-			                           artists[i].email, artists[i].email);
-	        } else {
-	                g_string_append_printf(str, "  %s<br/>",
-	                                      artists[i].name);
-	        }
-	}
-	g_string_append(str, "<BR/>");
 			
 	/* Current Translators */
 	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
 						   _("Current Translators"));
 	for (i = 0; current_translators[i].language != NULL; i++) {
 		if (current_translators[i].email != NULL) {
-			g_string_append_printf(str, "  <b>%s (%s)</b> - %s &lt;<a href=\"mailto:%s\">%s</a>&gt;<br/>",
+			g_string_append_printf(str, "  <b>%s (%s)</b> - <a href=\"mailto:%s\">%s</a><br/>",
 							_(current_translators[i].language),
 							current_translators[i].abbr,
-							_(current_translators[i].name),
 							current_translators[i].email,
-							current_translators[i].email);
+							_(current_translators[i].name));
 		} else {
 			g_string_append_printf(str, "  <b>%s (%s)</b> - %s<br/>",
 							_(current_translators[i].language),
@@ -523,12 +523,11 @@
 						   _("Past Translators"));
 	for (i = 0; past_translators[i].language != NULL; i++) {
 		if (past_translators[i].email != NULL) {
-			g_string_append_printf(str, "  <b>%s (%s)</b> - %s &lt;<a href=\"mailto:%s\">%s</a>&gt;<br/>",
+			g_string_append_printf(str, "  <b>%s (%s)</b> - <a href=\"mailto:%s\">%s</a><br/>",
 							_(past_translators[i].language),
 							past_translators[i].abbr,
-							_(past_translators[i].name),
 							past_translators[i].email,
-							past_translators[i].email);
+							_(past_translators[i].name));
 		} else {
 			g_string_append_printf(str, "  <b>%s (%s)</b> - %s<br/>",
 							_(past_translators[i].language),