# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1031973425 0
# Node ID 3335ef5fbecc22565ea9474d5eb11b3c2aff5a5f
# Parent  b79894c97bedeeefcb3d14a34da1a68c749e424e
[gaim-migrate @ 3564]
i18n fixes from paco-paco and msw, /topic fix from kingant. get the i18n fixes
into gtk1-stable and i'm done for the night.

committer: Tailor Script <tailor@pidgin.im>

diff -r b79894c97bed -r 3335ef5fbecc ChangeLog
--- a/ChangeLog	Sat Sep 14 03:08:39 2002 +0000
+++ b/ChangeLog	Sat Sep 14 03:17:05 2002 +0000
@@ -69,6 +69,9 @@
 	* Word-wrapping on mail notification text (Thanks, Andrew Molloy)
 	* Strip trailing and leading spaces from MSN/Yahoo names (Thanks,
 	  Arun Tharuvai)
+	*/topic when not an op now displays the current topic(thanks Mark 
+	 Doliner)
+	*i18n fixes (thanks Matt Wilson)
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)
diff -r b79894c97bed -r 3335ef5fbecc src/gtkimhtml.c
--- a/src/gtkimhtml.c	Sat Sep 14 03:08:39 2002 +0000
+++ b/src/gtkimhtml.c	Sat Sep 14 03:17:05 2002 +0000
@@ -2119,8 +2119,6 @@
 			ret_font = gdk_font_load (tmp); 
 		else {
 			/* For some reason, fontsets must end with a single * as an xlfd */
-			gchar *garbage = tmp;
-			tmp = g_strconcat(garbage, ",*", NULL);
 			ret_font = gdk_fontset_load (tmp); 
 		}
 		/* If the font didn't load, we change some of the xlfds one by one
diff -r b79894c97bed -r 3335ef5fbecc src/protocols/irc/irc.c
--- a/src/protocols/irc/irc.c	Sat Sep 14 03:08:39 2002 +0000
+++ b/src/protocols/irc/irc.c	Sat Sep 14 03:17:05 2002 +0000
@@ -1592,11 +1592,14 @@
 		irc_write(id->fd, buf, strlen(buf));
 	} else if (!g_strcasecmp(pdibuf, "TOPIC")) {
 		if (!*word_eol[2]) {
-			g_free(what);
-			return -EINVAL;
+			struct conversation *c;
+			c = irc_find_chat(gc, who);
+			g_snprintf(buf, sizeof(buf), _("Topic for %s is %s"), who, c->topic ? c->topic : "(no topic set)");
+			write_to_conv(c, buf, WFLAG_SYSTEM | WFLAG_NOLOG, NULL, time(NULL), -1);
+		} else {
+			g_snprintf(buf, sizeof(buf), "TOPIC %s :%s\r\n", who, word_eol[2]);
+			irc_write(id->fd, buf, strlen(buf));
 		}
-		g_snprintf(buf, sizeof(buf), "TOPIC %s :%s\r\n", who, word_eol[2]);
-		irc_write(id->fd, buf, strlen(buf));
 	} else if (!g_strcasecmp(pdibuf, "NICK")) {
 		if (!*word_eol[2]) {
 			g_free(what);