Mercurial > pidgin
changeset 20740:15f61e6b15cd
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 4321e1e266d11dddee2cde190828ae5001812367)
to branch 'im.pidgin.pidgin' (head 318be6f085ab78b9dd20f3b05869cca1fed28686)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 01 Oct 2007 04:21:32 +0000 |
| parents | f653af2d4659 (current diff) f837139b3732 (diff) |
| children | c00098c8e2cf |
| files | COPYRIGHT ChangeLog finch/gntconn.c finch/gntconv.c libpurple/protocols/jabber/jabber.c libpurple/protocols/msn/directconn.c libpurple/protocols/msn/msn-utils.c libpurple/protocols/msn/msn-utils.h libpurple/protocols/msn/msn.c libpurple/protocols/msn/servconn.c libpurple/protocols/myspace/markup.c libpurple/protocols/myspace/user.c libpurple/util.c libpurple/win32/win32dep.c pidgin/gtkblist.c pidgin/gtkcellrendererexpander.c pidgin/gtkconv.c pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c pidgin/gtknotify.c pidgin/gtkprefs.c |
| diffstat | 8 files changed, 28 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Sep 30 23:26:40 2007 +0000 +++ b/ChangeLog Mon Oct 01 04:21:32 2007 +0000 @@ -57,14 +57,14 @@ * Pressing 'Insert' in the buddylist will bring up the 'Add Buddy' dialog. -version 2.2.0 (09/13/2007): +Version 2.2.0 (09/13/2007): http://developer.pidgin.im/query?status=closed&milestone=2.2.0 Libpurple: * New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of Code) * XMPP enhancements. See - http://www.adiumx.com/blog/2007/07/soc-xmpp-update.php (Andreas + http://www.adiumx.com/blog/2007/07/soc-xmpp-update.php (Andreas Monitzer, Google Summer of Code for Adium) * Certificate management. Libpurple will validate certificates on SSL-encrypted protocols (William Ehlhardt, Google Summer of Code)
--- a/NEWS Sun Sep 30 23:26:40 2007 +0000 +++ b/NEWS Mon Oct 01 04:21:32 2007 +0000 @@ -5,6 +5,20 @@ ready for a general release. Instead, this is basically a bug fix release. + Luke: Unfortunately the necessity of this bug fix release means + some of the tickets that have been closed as part of the 2.2.1 + milestone are not actually fixed yet. We have grabbed as many + of the changes as we could while avoiding those that are as + yet unstable though, and this should still be a marked + improvement over 2.2.0. We have spent a lot of time since the + last release looking at the tickets that have been submitted + and many of them have been closed. + + Stu: I haven't NEWS'd in a while. I haven't actually done much for + too long also, maybe I'll find some time soon. This release is + basically what 2.2.0 should have been - it actually compiles this + time. + 2.2.0 (9/13/2007): Sean: 2.2.0 contains the results of several major Google Summer of Code branches bringing some new, extraordinary features. We
--- a/finch/libgnt/gntstyle.c Sun Sep 30 23:26:40 2007 +0000 +++ b/finch/libgnt/gntstyle.c Mon Oct 01 04:21:32 2007 +0000 @@ -26,7 +26,6 @@ #include <glib.h> #include <ctype.h> -#include <glib/gprintf.h> #include <stdlib.h> #include <string.h>
--- a/finch/libgnt/gntwm.c Sun Sep 30 23:26:40 2007 +0000 +++ b/finch/libgnt/gntwm.c Mon Oct 01 04:21:32 2007 +0000 @@ -27,8 +27,8 @@ #include "config.h" +#include <glib.h> #include <ctype.h> -#include <glib/gprintf.h> #include <gmodule.h> #include <stdlib.h> #include <string.h>
--- a/libpurple/protocols/jabber/google.c Sun Sep 30 23:26:40 2007 +0000 +++ b/libpurple/protocols/jabber/google.c Mon Oct 01 04:21:32 2007 +0000 @@ -64,7 +64,8 @@ message = xmlnode_get_child(child, "mail-thread-info"); if (count == 0 || !message) { - purple_notify_emails(js->gc, count, FALSE, NULL, NULL, (const char**) default_tos, NULL, NULL, NULL); + if (count > 0) + purple_notify_emails(js->gc, count, FALSE, NULL, NULL, (const char**) default_tos, NULL, NULL, NULL); g_free(default_tos[0]); return; }
--- a/libpurple/protocols/jabber/jutil.h Sun Sep 30 23:26:40 2007 +0000 +++ b/libpurple/protocols/jabber/jutil.h Mon Oct 01 04:21:32 2007 +0000 @@ -22,8 +22,6 @@ #ifndef _PURPLE_JABBER_JUTIL_H_ #define _PURPLE_JABBER_JUTIL_H_ -#include "account.h" - typedef struct _JabberID { char *node; char *domain;
--- a/pidgin/gtkconv.c Sun Sep 30 23:26:40 2007 +0000 +++ b/pidgin/gtkconv.c Mon Oct 01 04:21:32 2007 +0000 @@ -6835,7 +6835,9 @@ event = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(gtkconv->u.im->icon_container), event); +#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE); +#endif gtk_widget_add_events(event, GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK); g_signal_connect(G_OBJECT(event), "button-press-event", @@ -8940,7 +8942,9 @@ /* Close button. */ gtkconv->close = gtk_event_box_new(); +#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(gtkconv->close), FALSE); +#endif gtk_widget_set_events(gtkconv->close, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); close_image = gtk_label_new("×"); g_signal_connect(G_OBJECT(gtkconv->close), "enter-notify-event", G_CALLBACK(close_button_entered_cb), close_image);
--- a/pidgin/gtknotify.c Sun Sep 30 23:26:40 2007 +0000 +++ b/pidgin/gtknotify.c Mon Oct 01 04:21:32 2007 +0000 @@ -430,7 +430,12 @@ PIDGIN_MAIL_DATA, &data, -1); if (data->account == account) { if (clear) { +#if GTK_CHECK_VERSION(2,2,0) advanced = gtk_tree_store_remove(treemodel, &iter); +#else + gtk_tree_store_remove(treemodel, &iter); + advanced = (iter.stamp == 0) ? FALSE : TRUE; +#endif purple_notify_close(PURPLE_NOTIFY_EMAILS, data); /* We're completely done if we've processed all entries */ if (!advanced)