Mercurial > pidgin
changeset 23924:5e4aa29dc06f
merge of '9db6cf3ac465ef3a7aca0eee0f47e02d3ea7b162'
and 'df9bd43dee8443645563807861da728cd7ae6e26'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Mon, 18 Aug 2008 16:03:19 +0000 |
| parents | ca3dc911bf52 (diff) a08f60f6b794 (current diff) |
| children | 5c27dc26a3c0 |
| files | |
| diffstat | 9 files changed, 20 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Aug 18 15:35:12 2008 +0000 +++ b/ChangeLog Mon Aug 18 16:03: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/16/2008): +version 2.5.0 (08/17/2008): libpurple: * Ability to create custom smileys (currently only the MSN protocol utilizes the feature). (Thanks to Mauro Sérgio Ferreira Brasil,
--- a/ChangeLog.API Mon Aug 18 15:35:12 2008 +0000 +++ b/ChangeLog.API Mon Aug 18 16:03: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/16/2008): +version 2.5.0 (08/17/2008): libpurple: Added: * Connection flag PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY to indicate
--- a/ChangeLog.win32 Mon Aug 18 15:35:12 2008 +0000 +++ b/ChangeLog.win32 Mon Aug 18 16:03:19 2008 +0000 @@ -1,4 +1,4 @@ -version 2.5.0 (08/16/2008): +version 2.5.0 (08/17/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/NEWS Mon Aug 18 15:35:12 2008 +0000 +++ b/NEWS Mon Aug 18 16:03:19 2008 +0000 @@ -1,6 +1,6 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -2.5.0 (08/16/2008): +2.5.0 (08/17/2008): Daniel: Lots of good stuff in this release. Lots of people have worked very hard on the updated MSN protocol, and it's finally time to bring it to the world! There are myriad bugfixes, including some important
--- a/libpurple/protocols/oscar/family_oservice.c Mon Aug 18 15:35:12 2008 +0000 +++ b/libpurple/protocols/oscar/family_oservice.c Mon Aug 18 16:03:19 2008 +0000 @@ -29,7 +29,7 @@ /* Subtype 0x0002 - Client Online */ void -aim_clientready(OscarData *od, FlapConnection *conn) +aim_srv_clientready(OscarData *od, FlapConnection *conn) { ByteStream bs; aim_snacid_t snacid;
--- a/libpurple/protocols/oscar/oscar.c Mon Aug 18 15:35:12 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Aug 18 16:03:19 2008 +0000 @@ -1192,7 +1192,7 @@ static void flap_connection_established_admin(OscarData *od, FlapConnection *conn) { - aim_clientready(od, conn); + aim_srv_clientready(od, conn); purple_debug_info("oscar", "connected to admin\n"); if (od->chpass) { @@ -1237,7 +1237,7 @@ struct chat_connection *chatcon; static int id = 1; - aim_clientready(od, conn); + aim_srv_clientready(od, conn); chatcon = find_oscar_chat_by_conn(gc, conn); if (chatcon) { @@ -1249,7 +1249,7 @@ static void flap_connection_established_chatnav(OscarData *od, FlapConnection *conn) { - aim_clientready(od, conn); + aim_srv_clientready(od, conn); aim_chatnav_reqrights(od, conn); } @@ -1258,7 +1258,7 @@ { aim_email_sendcookies(od); aim_email_activate(od); - aim_clientready(od, conn); + aim_srv_clientready(od, conn); } static void @@ -1266,7 +1266,7 @@ { PurpleConnection *gc = od->gc; - aim_clientready(od, conn); + aim_srv_clientready(od, conn); od->iconconnecting = FALSE; @@ -3770,7 +3770,7 @@ purple_debug_info("oscar", "buddy list loaded\n"); - aim_clientready(od, conn); + aim_srv_clientready(od, conn); if (purple_account_get_user_info(account) != NULL) serv_set_info(gc, purple_account_get_user_info(account));
--- a/libpurple/protocols/oscar/oscar.h Mon Aug 18 15:35:12 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.h Mon Aug 18 16:03:19 2008 +0000 @@ -607,13 +607,10 @@ } chat; }; -void aim_clientready(OscarData *od, FlapConnection *conn); int aim_request_login(OscarData *od, FlapConnection *conn, const char *sn); int aim_send_login(OscarData *od, FlapConnection *conn, const char *sn, const char *password, gboolean truncate_pass, ClientInfo *ci, const char *key, gboolean allow_multiple_logins); /* 0x000b */ int aim_auth_securid_send(OscarData *od, const char *securid); -void aim_cleansnacs(OscarData *, int maxage); - void oscar_data_addhandler(OscarData *od, guint16 family, guint16 subtype, aim_rxcallback_t newhandler, guint16 flags); aim_rxcallback_t aim_callhandler(OscarData *od, guint16 family, guint16 subtype); @@ -651,6 +648,7 @@ /* 0x0001 - family_oservice.c */ +/* 0x0002 */ void aim_srv_clientready(OscarData *od, FlapConnection *conn); /* 0x0004 */ void aim_srv_requestnew(OscarData *od, guint16 serviceid); /* 0x0006 */ void aim_srv_reqrates(OscarData *od, FlapConnection *conn); /* 0x0008 */ void aim_srv_rates_addparam(OscarData *od, FlapConnection *conn); @@ -1609,6 +1607,7 @@ aim_snacid_t aim_newsnac(OscarData *, aim_snac_t *newsnac); aim_snacid_t aim_cachesnac(OscarData *od, const guint16 family, const guint16 type, const guint16 flags, const void *data, const int datalen); aim_snac_t *aim_remsnac(OscarData *, aim_snacid_t id); +void aim_cleansnacs(OscarData *, int maxage); int aim_putsnac(ByteStream *, guint16 family, guint16 type, guint16 flags, aim_snacid_t id); struct chatsnacinfo {
--- a/libpurple/sslconn.c Mon Aug 18 15:35:12 2008 +0000 +++ b/libpurple/sslconn.c Mon Aug 18 16:03:19 2008 +0000 @@ -27,6 +27,7 @@ #include "certificate.h" #include "debug.h" +#include "request.h" #include "sslconn.h" static gboolean _ssl_initialized = FALSE; @@ -227,6 +228,9 @@ g_return_if_fail(gsc != NULL); + purple_request_close_with_handle(gsc); + purple_notify_close_with_handle(gsc); + ops = purple_ssl_get_ops(); (ops->close)(gsc);
--- a/pidgin/gtkconv.c Mon Aug 18 15:35:12 2008 +0000 +++ b/pidgin/gtkconv.c Mon Aug 18 16:03:19 2008 +0000 @@ -7370,7 +7370,9 @@ if (gtkconv) { conv = gtkconv->active_conv; - pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON | PIDGIN_CONV_COLORIZE_TITLE); + pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON + | PIDGIN_CONV_COLORIZE_TITLE + | PIDGIN_CONV_BUDDY_ICON); if ((purple_status_is_online(old) ^ purple_status_is_online(newstatus)) != 0) pidgin_conv_update_fields(conv, PIDGIN_CONV_MENU); }