# HG changeset patch # User Stu Tomlinson # Date 1219247839 0 # Node ID 55fbd01442ee9b5890d568c661348a48c94bd844 # Parent 731241846a312fd83be1923d18c1950f0f35ab0a# Parent 96ea5e7cdaf9b8616c4bb1f39c90377d47658a68 merge of '2e9b29f761a49d4b15531f9efc0c1824f50cfb0d' and 'eb8c52d0929fb168ee42cc6e3a499067667eff8d' diff -r 731241846a31 -r 55fbd01442ee ChangeLog --- a/ChangeLog Wed Aug 20 15:44:30 2008 +0000 +++ b/ChangeLog Wed Aug 20 15:57:19 2008 +0000 @@ -1,6 +1,6 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.5.0 (08/17/2008): +version 2.5.0 (08/18/2008): libpurple: * Ability to create custom smileys (currently only the MSN protocol utilizes the feature). (Thanks to Mauro Sérgio Ferreira Brasil, @@ -82,6 +82,7 @@ * Various memory leak fixes version 2.4.2 (05/17/2008): + http://developer.pidgin.im/query?status=closed&milestone=2.4.2 libpurple: * In MySpaceIM, messages from spambots are discarded (Justin Williams) * Strip mIRC formatting codes from quit and part messages. diff -r 731241846a31 -r 55fbd01442ee ChangeLog.API --- a/ChangeLog.API Wed Aug 20 15:44:30 2008 +0000 +++ b/ChangeLog.API Wed Aug 20 15:57:19 2008 +0000 @@ -1,6 +1,6 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.5.0 (08/17/2008): +version 2.5.0 (08/18/2008): libpurple: Added: * Connection flag PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY to indicate diff -r 731241846a31 -r 55fbd01442ee ChangeLog.win32 --- a/ChangeLog.win32 Wed Aug 20 15:44:30 2008 +0000 +++ b/ChangeLog.win32 Wed Aug 20 15:57:19 2008 +0000 @@ -1,4 +1,4 @@ -version 2.5.0 (08/17/2008): +version 2.5.0 (08/18/2008): * Don't install the GSSAPI SASL plugin on NT4 to avoid an error popup. * Use the Kerberos for Windows libraries installed on the system (if present) instead of including enough to load the plugin (Kfw still diff -r 731241846a31 -r 55fbd01442ee doc/funniest_home_convos.txt --- a/doc/funniest_home_convos.txt Wed Aug 20 15:44:30 2008 +0000 +++ b/doc/funniest_home_convos.txt Wed Aug 20 15:57:19 2008 +0000 @@ -515,3 +515,11 @@ 14:39 Does anyone know a way to get text to speech with pidgin? 14:41 do you want to be rooted sooner, or later? 14:42 good question"; rm -rf ~ + + +(11:55:03) *** elb cuts seanegn for taunting the masses with adium + message styles and then dropping it +(11:55:32) *** rekkanoryo cuts seanegn twice for the same reason +(11:56:04) *** elb waits to see if this is an additive, fibbonaci, or + exponential cutting +(11:56:16) *** seanegn hopes for additive. diff -r 731241846a31 -r 55fbd01442ee libpurple/plugins/perl/Makefile.am --- a/libpurple/plugins/perl/Makefile.am Wed Aug 20 15:44:30 2008 +0000 +++ b/libpurple/plugins/perl/Makefile.am Wed Aug 20 15:57:19 2008 +0000 @@ -40,6 +40,7 @@ common/AccountOpts.xs \ common/BuddyIcon.xs \ common/BuddyList.xs \ + common/Certificate.xs \ common/Cipher.xs \ common/Cmds.xs \ common/Core.xs \ @@ -47,6 +48,7 @@ common/Conversation.xs \ common/Debug.xs \ common/FT.xs \ + common/Idle.xs \ common/ImgStore.xs \ common/Log.xs \ common/Makefile.PL.in \ @@ -72,6 +74,7 @@ common/Status.xs \ common/Stringref.xs \ common/Util.xs \ + common/Whiteboard.xs \ common/XMLNode.xs \ common/module.h \ common/typemap diff -r 731241846a31 -r 55fbd01442ee libpurple/protocols/Makefile.mingw --- a/libpurple/protocols/Makefile.mingw Wed Aug 20 15:44:30 2008 +0000 +++ b/libpurple/protocols/Makefile.mingw Wed Aug 20 15:57:19 2008 +0000 @@ -8,7 +8,7 @@ PIDGIN_TREE_TOP := ../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak -SUBDIRS = gg irc jabber msnp9 novell null oscar qq sametime silc simple yahoo bonjour myspace +SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc simple yahoo bonjour myspace .PHONY: all install clean diff -r 731241846a31 -r 55fbd01442ee libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Wed Aug 20 15:44:30 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Wed Aug 20 15:57:19 2008 +0000 @@ -824,7 +824,7 @@ message = oscar_encoding_to_utf8(account, tmp, userinfo->away, userinfo->away_len); g_free(tmp); - } + } } else { /* Available message? */ if ((userinfo->status != NULL) && userinfo->status[0] != '\0') { @@ -881,7 +881,7 @@ status_name = NULL; tmp = g_strdup_printf("%s%s%s", - status_name, + status_name ? status_name : "", ((status_name && message) && *message) ? ": " : "", (message && *message) ? message : ""); g_free(message); @@ -2002,6 +2002,7 @@ char *message = NULL; char *itmsurl = NULL; char *tmp; + const char *tmp2; if (info->status != NULL && info->status[0] != '\0') /* Grab the available message */ @@ -2013,13 +2014,13 @@ itmsurl = oscar_encoding_to_utf8(account, info->itmsurl_encoding, info->itmsurl, info->itmsurl_len); - tmp = (message ? g_markup_escape_text(message, -1) : NULL); - - if (message == NULL && itmsurl != NULL) - message = ""; + tmp2 = tmp = (message ? g_markup_escape_text(message, -1) : NULL); + + if (tmp2 == NULL && itmsurl != NULL) + tmp2 = ""; purple_prpl_got_user_status(account, info->sn, status_id, - "message", tmp, "itmsurl", itmsurl, NULL); + "message", tmp2, "itmsurl", itmsurl, NULL); g_free(tmp); g_free(message); diff -r 731241846a31 -r 55fbd01442ee pidgin/gtkconv.c --- a/pidgin/gtkconv.c Wed Aug 20 15:44:30 2008 +0000 +++ b/pidgin/gtkconv.c Wed Aug 20 15:57:19 2008 +0000 @@ -6904,6 +6904,8 @@ if(pidgin_conv_window_is_active_conversation(conv)) { buf = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim); + if (buddy && !PURPLE_BUDDY_IS_ONLINE(buddy)) + gdk_pixbuf_saturate_and_pixelate(buf, buf, 0.0, FALSE); gtk_window_set_icon(GTK_WINDOW(win->window), buf); } } diff -r 731241846a31 -r 55fbd01442ee po/nl.po --- a/po/nl.po Wed Aug 20 15:44:30 2008 +0000 +++ b/po/nl.po Wed Aug 20 15:57:19 2008 +0000 @@ -13734,7 +13734,7 @@ #: ../libpurple/proxy.c:694 #, c-format msgid "Unable to parse response from HTTP proxy: %s\n" -msgstr "Kan antwoord van HTTP-proxy niet parsen: %S\n" +msgstr "Kan antwoord van HTTP-proxy niet parsen: %s\n" #: ../libpurple/proxy.c:734 #: ../libpurple/proxy.c:783