Mercurial > pidgin
changeset 23934:93a9cef58d05
merge of '46196fef32aa6c83b1155e906772d576c064fa25'
and 'bfdc7e5d5feaa231a259f2cfc813699e2d6deb27'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Wed, 20 Aug 2008 00:34:16 +0000 |
| parents | ca2de55021ae (current diff) 6ea4bb85e60c (diff) |
| children | 2457162f6750 9b2c273d764d |
| files | |
| diffstat | 7 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Aug 19 23:07:11 2008 +0000 +++ b/ChangeLog Wed Aug 20 00:34:16 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.
--- a/ChangeLog.API Tue Aug 19 23:07:11 2008 +0000 +++ b/ChangeLog.API Wed Aug 20 00:34:16 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
--- a/ChangeLog.win32 Tue Aug 19 23:07:11 2008 +0000 +++ b/ChangeLog.win32 Wed Aug 20 00:34:16 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
--- a/doc/funniest_home_convos.txt Tue Aug 19 23:07:11 2008 +0000 +++ b/doc/funniest_home_convos.txt Wed Aug 20 00:34:16 2008 +0000 @@ -515,3 +515,11 @@ 14:39 <rrobbertt> Does anyone know a way to get text to speech with pidgin? 14:41 <elb> do you want to be rooted sooner, or later? 14:42 <seanegan> 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.
--- a/libpurple/plugins/perl/Makefile.am Tue Aug 19 23:07:11 2008 +0000 +++ b/libpurple/plugins/perl/Makefile.am Wed Aug 20 00:34:16 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
--- a/libpurple/protocols/Makefile.mingw Tue Aug 19 23:07:11 2008 +0000 +++ b/libpurple/protocols/Makefile.mingw Wed Aug 20 00:34:16 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
--- a/pidgin/gtkconv.c Tue Aug 19 23:07:11 2008 +0000 +++ b/pidgin/gtkconv.c Wed Aug 20 00:34:16 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); } }