Mercurial > pidgin.yaz
changeset 3501:3335ef5fbecc
[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>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 14 Sep 2002 03:17:05 +0000 |
| parents | b79894c97bed |
| children | a8ecf770ff43 |
| files | ChangeLog src/gtkimhtml.c src/protocols/irc/irc.c |
| diffstat | 3 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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
--- 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);