Mercurial > pidgin.yaz
changeset 3273:943e2b3224a9
[gaim-migrate @ 3291]
more de-aim-ization, and a buddy pounce fix.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 25 May 2002 18:58:24 +0000 |
| parents | a0676e830051 |
| children | 572b9d648c94 |
| files | src/about.c src/buddy.c |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/about.c Fri May 24 00:03:14 2002 +0000 +++ b/src/about.c Sat May 25 18:58:24 2002 +0000 @@ -132,8 +132,9 @@ label = gtk_label_new( - _("Gaim is a client that supports AOL's Instant Messenger protocol. It is written\n" - "using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE "\n\n" + _("Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n" + "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n" + "I is written using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE "\n\n" "IRC: #gaim on irc.openprojects.net")); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
--- a/src/buddy.c Fri May 24 00:03:14 2002 +0000 +++ b/src/buddy.c Sat May 25 18:58:24 2002 +0000 @@ -1607,9 +1607,9 @@ * because I thought it'd be funny :-) */ g_snprintf(tmp, sizeof(tmp), "%s has %s", name, - (b->options & OPT_POUNCE_TYPING) ? "started typing to you" : - (b->options & OPT_POUNCE_SIGNON) ? "signed on" : - (b->options & OPT_POUNCE_UNIDLE) ? "returned from being idle" : + (when & OPT_POUNCE_TYPING) ? "started typing to you" : + (when & OPT_POUNCE_SIGNON) ? "signed on" : + (when & OPT_POUNCE_UNIDLE) ? "returned from being idle" : "returned from being away"); do_error_dialog(tmp, _("Buddy Pounce"));