# HG changeset patch # User Richard Laager # Date 1177537803 0 # Node ID 776acf50d50fdcbfbe85895686e311fe3bda5348 # Parent 9f99419242331066ebc731bb8410fe0f653e0431# Parent 50380e48fb65639e1acbfbaa1059351300a5575e propagate from branch 'im.pidgin.pidgin' (head ace53c6cc80b256fff29f021ab5b80805deb253b) to branch 'im.pidgin.rlaager.gaim_migration' (head 6a1e095354b91410a1a7496e6567ca2763dd02ae) diff -r 9f9941924233 -r 776acf50d50f COPYRIGHT --- a/COPYRIGHT Wed Apr 25 21:49:58 2007 +0000 +++ b/COPYRIGHT Wed Apr 25 21:50:03 2007 +0000 @@ -39,6 +39,7 @@ Herman Bloggs David Blue Jason Boerner +Hylke Bons Graham Booker Paolo Borelli Julien Bossart @@ -227,6 +228,7 @@ Paul Miller Arkadiusz Miskiewicz Andrew Molloy +Michael Monreal Benjamin Moody Tim Mooney Sergio Moretto @@ -234,6 +236,7 @@ Richard Nelson Dennis Nezic Matthew A. Nicholson +Andreas Nilsson Henning Norén Szilard Novaki Novell diff -r 9f9941924233 -r 776acf50d50f ChangeLog --- a/ChangeLog Wed Apr 25 21:49:58 2007 +0000 +++ b/ChangeLog Wed Apr 25 21:50:03 2007 +0000 @@ -172,6 +172,7 @@ * Added /nickserv, /memoserv, /chanserv and /operserv commands (Joao Luís Marques Pinto) * Added CTCP VERSION via /version (Andrej Krivulčík) + * Added /whowas command (achris) Jabber Features: * Support for SRV lookups diff -r 9f9941924233 -r 776acf50d50f libpurple/protocols/irc/cmds.c --- a/libpurple/protocols/irc/cmds.c Wed Apr 25 21:49:58 2007 +0000 +++ b/libpurple/protocols/irc/cmds.c Wed Apr 25 21:50:03 2007 +0000 @@ -559,6 +559,22 @@ return 0; } +int irc_cmd_whowas(struct irc_conn *irc, const char *cmd, const char *target, const char **args) +{ + char *buf; + + if (!args || !args[0]) + return 0; + + buf = irc_format(irc, "vn", "WHOWAS", args[0]); + + irc->whois.nick = g_strdup(args[0]); + irc_send(irc, buf); + g_free(buf); + + return 0; +} + static void irc_do_mode(struct irc_conn *irc, const char *target, const char *sign, char **ops) { char *buf, mode[5]; diff -r 9f9941924233 -r 776acf50d50f libpurple/protocols/irc/irc.h --- a/libpurple/protocols/irc/irc.h Wed Apr 25 21:49:58 2007 +0000 +++ b/libpurple/protocols/irc/irc.h Wed Apr 25 21:50:03 2007 +0000 @@ -179,6 +179,7 @@ int irc_cmd_topic(struct irc_conn *irc, const char *cmd, const char *target, const char **args); int irc_cmd_wallops(struct irc_conn *irc, const char *cmd, const char *target, const char **args); int irc_cmd_whois(struct irc_conn *irc, const char *cmd, const char *target, const char **args); +int irc_cmd_whowas(struct irc_conn *irc, const char *cmd, const char *target, const char **args); PurpleXfer *irc_dccsend_new_xfer(PurpleConnection *gc, const char *who); void irc_dccsend_send_file(PurpleConnection *gc, const char *who, const char *file); diff -r 9f9941924233 -r 776acf50d50f libpurple/protocols/irc/msgs.c --- a/libpurple/protocols/irc/msgs.c Wed Apr 25 21:49:58 2007 +0000 +++ b/libpurple/protocols/irc/msgs.c Wed Apr 25 21:50:03 2007 +0000 @@ -236,18 +236,20 @@ void irc_msg_whois(struct irc_conn *irc, const char *name, const char *from, char **args) { if (!irc->whois.nick) { - purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unexpected WHOIS reply for %s\n", args[1]); + purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unexpected %s reply for %s\n", !strcmp(name, "314") ? "WHOWAS" : "WHOIS" + , args[1]); return; } if (purple_utf8_strcasecmp(irc->whois.nick, args[1])) { - purple_debug(PURPLE_DEBUG_WARNING, "irc", "Got WHOIS reply for %s while waiting for %s\n", args[1], irc->whois.nick); + purple_debug(PURPLE_DEBUG_WARNING, "irc", "Got %s reply for %s while waiting for %s\n", !strcmp(name, "314") ? "WHOWAS" : "WHOIS" + , args[1], irc->whois.nick); return; } if (!strcmp(name, "301")) { irc->whois.away = g_strdup(args[2]); - } else if (!strcmp(name, "311")) { + } else if (!strcmp(name, "311") || !strcmp(name, "314")) { irc->whois.userhost = g_strdup_printf("%s@%s", args[2], args[3]); irc->whois.name = g_strdup(args[5]); } else if (!strcmp(name, "312")) { @@ -273,11 +275,13 @@ PurpleNotifyUserInfo *user_info; if (!irc->whois.nick) { - purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unexpected End of WHOIS for %s\n", args[1]); + purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unexpected End of %s for %s\n", !strcmp(name, "369") ? "WHOWAS" : "WHOIS" + , args[1]); return; } if (purple_utf8_strcasecmp(irc->whois.nick, args[1])) { - purple_debug(PURPLE_DEBUG_WARNING, "irc", "Received end of WHOIS for %s, expecting %s\n", args[1], irc->whois.nick); + purple_debug(PURPLE_DEBUG_WARNING, "irc", "Received end of %s for %s, expecting %s\n", !strcmp(name, "369") ? "WHOWAS" : "WHOIS" + , args[1], irc->whois.nick); return; } diff -r 9f9941924233 -r 776acf50d50f libpurple/protocols/irc/parse.c --- a/libpurple/protocols/irc/parse.c Wed Apr 25 21:49:58 2007 +0000 +++ b/libpurple/protocols/irc/parse.c Wed Apr 25 21:50:03 2007 +0000 @@ -64,6 +64,8 @@ { "318", "nt:", irc_msg_endwhois }, /* End of WHOIS */ { "319", "nn:", irc_msg_whois }, /* Whois channels */ { "320", "nn:", irc_msg_whois }, /* Whois (fn ident) */ + { "314", "nnvvv:", irc_msg_whois }, /* Whowas user */ + { "369", "nt:", irc_msg_endwhois }, /* End of WHOWAS */ { "321", "*", irc_msg_list }, /* Start of list */ { "322", "ncv:", irc_msg_list }, /* List. */ { "323", ":", irc_msg_list }, /* End of list. */ @@ -78,6 +80,7 @@ { "376", "n:", irc_msg_motd }, /* End of MOTD */ { "391", "nv:", irc_msg_time }, /* Time reply */ { "401", "nt:", irc_msg_nonick }, /* No such nick/chan */ + { "406", "nt:", irc_msg_nonick }, /* No such nick for WHOWAS */ { "403", "nc:", irc_msg_nochan }, /* No such channel */ { "404", "nt:", irc_msg_nosend }, /* Cannot send to chan */ { "421", "nv:", irc_msg_unknown }, /* Unknown command */ @@ -148,6 +151,7 @@ { "voice", ":", irc_cmd_op, N_("voice <nick1> [nick2] ...: Grant channel voice status to someone. You must be a channel operator to do this.") }, { "wallops", ":", irc_cmd_wallops, N_("wallops <message>: If you don't know what this is, you probably can't use it.") }, { "whois", "tt", irc_cmd_whois, N_("whois [server] <nick>: Get information on a user.") }, + { "whowas", "t", irc_cmd_whowas, N_("whowas <nick>: Get information on a user that has logged off.") }, { NULL, NULL, NULL, NULL } }; diff -r 9f9941924233 -r 776acf50d50f libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Wed Apr 25 21:49:58 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Wed Apr 25 21:50:03 2007 +0000 @@ -5705,7 +5705,7 @@ purple_value_new(PURPLE_TYPE_STRING), NULL); status_types = g_list_prepend(status_types, type); - type = purple_status_type_new_with_attrs(PURPLE_STATUS_EXTENDED_AWAY, + type = purple_status_type_new_with_attrs(PURPLE_STATUS_UNAVAILABLE, OSCAR_STATUS_ID_DND, _("Do Not Disturb"), TRUE, is_icq, FALSE, "message", _("Message"), diff -r 9f9941924233 -r 776acf50d50f pidgin.spec.in --- a/pidgin.spec.in Wed Apr 25 21:49:58 2007 +0000 +++ b/pidgin.spec.in Wed Apr 25 21:50:03 2007 +0000 @@ -347,7 +347,7 @@ %defattr(-, root, root) %{_libdir}/libpurple.so.* -%dir %{_libdir}/libpurple +%dir %{_libdir}/purple %attr(755, root, root) %{perl_vendorarch}/Purple.pm %dir %{perl_vendorarch}/auto/Purple %attr(755, root, root) %{perl_vendorarch}/auto/Purple/Purple.so @@ -433,6 +433,9 @@ %endif %changelog +* Wed Apr 25 2007 Stu Tomlinson +- Update libpurple to pick up plugins in %%{_libdir}/purple + * Sun Apr 22 2007 Stu Tomlinson - Remove Epoch because it's gone in Fedora now - Add virtual provides for gaim & gaim-devel diff -r 9f9941924233 -r 776acf50d50f pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Wed Apr 25 21:49:58 2007 +0000 +++ b/pidgin/gtkdialogs.c Wed Apr 25 21:50:03 2007 +0000 @@ -107,7 +107,7 @@ static struct developer retired_developers[] = { {"Herman Bloggs", N_("win32 port"), "herman@bluedigits.com"}, {"Jim Duchek", N_("maintainer"), "jim@linuxpimps.com"}, - {"Rob Flynn", N_("maintainer"), "purple@robflynn.com"}, + {"Rob Flynn", N_("maintainer"), NULL}, {"Adam Fritzler", N_("libfaim maintainer"), 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}, @@ -264,7 +264,7 @@ } /* This function puts the version number onto the pixmap we use in the 'about' - * screen in Purple. */ + * screen in Pidgin. */ static void pidgin_logo_versionize(GdkPixbuf **original, GtkWidget *widget) { GdkPixmap *pixmap; diff -r 9f9941924233 -r 776acf50d50f pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Wed Apr 25 21:49:58 2007 +0000 +++ b/pidgin/gtkstatusbox.c Wed Apr 25 21:50:03 2007 +0000 @@ -914,7 +914,6 @@ { GList *list, *cur; GdkPixbuf *pixbuf; - PidginStatusBoxItemType type = PIDGIN_STATUS_BOX_TYPE_POPULAR; list = purple_savedstatuses_get_popular(6); if (list == NULL) @@ -929,6 +928,7 @@ const gchar *message; gchar *stripped = NULL; PurpleStatusPrimitive prim; + PidginStatusBoxItemType type = PIDGIN_STATUS_BOX_TYPE_POPULAR; /* Get an appropriate status icon */ prim = purple_savedstatus_get_type(saved); diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/emotes/default/22/Makefile.am --- a/pidgin/pixmaps/emotes/default/22/Makefile.am Wed Apr 25 21:49:58 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/Makefile.am Wed Apr 25 21:50:03 2007 +0000 @@ -62,6 +62,7 @@ foot-in-mouth.png \ freaked-out.png \ ghost.png \ + giggle.png \ girl.png \ glasses-cool.png \ glasses-nerdy.png \ @@ -87,6 +88,7 @@ love-over.png \ love.png \ lying.png \ + mad-tongue.png \ mail.png \ mean.png \ meeting.png \ @@ -99,6 +101,7 @@ msn_online.png \ msn.png \ musical-note.png \ + nailbiting.png \ neutral.png \ party.png \ peace.png \ @@ -158,10 +161,12 @@ umbrella.png \ vampire.png \ victory.png \ + waiting.png \ watermelon.png \ weep.png \ wilt.png \ wink.png \ + worship.png \ yawn.png \ yin-yang.png diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/emotes/default/22/theme --- a/pidgin/pixmaps/emotes/default/22/theme Wed Apr 25 21:49:58 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/theme Wed Apr 25 21:50:03 2007 +0000 @@ -273,7 +273,7 @@ bye.png =; arrogant.png [-( thinking.png :-? -waiting.png :-w :-W +waiting.png :-w :-W #at_wits_end ~x( ~X( MISSING: "Why.Does.This.Not.Work.AAAAARGH!!" => angry smily shouting and pulling hair off smile-big.png :D :-D :d :-d tongue.png :-P :P :-p :p @@ -322,8 +322,8 @@ clover.png %%- musical-note.png :-" nailbiting.png :-SS :-ss -giggle.png ;)) -worship.png ^:)^ +giggle.png ;)) +worship.png ^:)^ star.png (*) mad-tongue.png >:p #yahoo_waving.gif >:/ TODO diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/Makefile.am --- a/pidgin/pixmaps/toolbar/16/Makefile.am Wed Apr 25 21:49:58 2007 +0000 +++ b/pidgin/pixmaps/toolbar/16/Makefile.am Wed Apr 25 21:50:03 2007 +0000 @@ -1,7 +1,6 @@ SUBDIRS = scalable -EXTRA_DIST = accounts.png \ - change-bgcolor.png \ +EXTRA_DIST = change-bgcolor.png \ change-fgcolor.png \ emote-select.png \ font-face.png \ @@ -11,10 +10,7 @@ insert-link.png \ message-new.png \ plugins.png \ - typing.png \ - unblock.png \ - user-info.png \ - window-icon.png + unblock.png pidgintoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/16 pidgintoolbarpix_DATA = $(EXTRA_DIST) diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/accounts.png Binary file pidgin/pixmaps/toolbar/16/accounts.png has changed diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/plugins.png Binary file pidgin/pixmaps/toolbar/16/plugins.png has changed diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/scalable/Makefile.am --- a/pidgin/pixmaps/toolbar/16/scalable/Makefile.am Wed Apr 25 21:49:58 2007 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/Makefile.am Wed Apr 25 21:50:03 2007 +0000 @@ -1,14 +1,5 @@ -EXTRA_DIST = accounts.svg \ - change-bgcolor.svg \ +EXTRA_DIST = change-bgcolor.svg \ change-fgcolor.svg \ - connect.svg \ - disconnect.svg \ emote-select.svg \ font-size-down.svg \ - font-size-up.svg \ - insert-image.svg \ - message-new.svg \ - plugins.svg \ - typing.svg \ - user-info.svg \ - window-icon.svg + font-size-up.svg diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/scalable/accounts.svg --- a/pidgin/pixmaps/toolbar/16/scalable/accounts.svg Wed Apr 25 21:49:58 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,118 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/scalable/connect.svg --- a/pidgin/pixmaps/toolbar/16/scalable/connect.svg Wed Apr 25 21:49:58 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/scalable/disconnect.svg --- a/pidgin/pixmaps/toolbar/16/scalable/disconnect.svg Wed Apr 25 21:49:58 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/scalable/insert-image.svg --- a/pidgin/pixmaps/toolbar/16/scalable/insert-image.svg Wed Apr 25 21:49:58 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,316 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/scalable/message-new.svg --- a/pidgin/pixmaps/toolbar/16/scalable/message-new.svg Wed Apr 25 21:49:58 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/scalable/plugins.svg --- a/pidgin/pixmaps/toolbar/16/scalable/plugins.svg Wed Apr 25 21:49:58 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/scalable/typing.svg --- a/pidgin/pixmaps/toolbar/16/scalable/typing.svg Wed Apr 25 21:49:58 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,193 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/scalable/user-info.svg --- a/pidgin/pixmaps/toolbar/16/scalable/user-info.svg Wed Apr 25 21:49:58 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/scalable/window-icon.svg --- a/pidgin/pixmaps/toolbar/16/scalable/window-icon.svg Wed Apr 25 21:49:58 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/typing.png Binary file pidgin/pixmaps/toolbar/16/typing.png has changed diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/user-info.png Binary file pidgin/pixmaps/toolbar/16/user-info.png has changed diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/toolbar/16/window-icon.png Binary file pidgin/pixmaps/toolbar/16/window-icon.png has changed diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/tray/16/tray-extended-away.png Binary file pidgin/pixmaps/tray/16/tray-extended-away.png has changed diff -r 9f9941924233 -r 776acf50d50f pidgin/pixmaps/tray/22/tray-connecting.png Binary file pidgin/pixmaps/tray/22/tray-connecting.png has changed