# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1191267730 0
# Node ID e055690438e751770cd98b47474cd55d7d193838
# Parent  c00098c8e2cf53563a8d046f6c513dc9841223f3# Parent  e1b73323f28f89c46c057691cb750d239c5296f4
explicit merge of '34bd82146ec66294912412630b2ae269d548064b'
              and '17f03911cb3446c55f58db2c7b1ef404b52d22ec'

diff -r e1b73323f28f -r e055690438e7 COPYRIGHT
diff -r e1b73323f28f -r e055690438e7 ChangeLog
--- a/ChangeLog	Mon Oct 01 18:07:17 2007 +0000
+++ b/ChangeLog	Mon Oct 01 19:42:10 2007 +0000
@@ -64,7 +64,7 @@
 	* 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)
diff -r e1b73323f28f -r e055690438e7 NEWS
diff -r e1b73323f28f -r e055690438e7 finch/gntconn.c
diff -r e1b73323f28f -r e055690438e7 finch/gntconv.c
diff -r e1b73323f28f -r e055690438e7 finch/libgnt/gntstyle.c
--- a/finch/libgnt/gntstyle.c	Mon Oct 01 18:07:17 2007 +0000
+++ b/finch/libgnt/gntstyle.c	Mon Oct 01 19:42:10 2007 +0000
@@ -26,7 +26,6 @@
 
 #include <glib.h>
 #include <ctype.h>
-#include <glib/gprintf.h>
 #include <stdlib.h>
 #include <string.h>
 
diff -r e1b73323f28f -r e055690438e7 finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c	Mon Oct 01 18:07:17 2007 +0000
+++ b/finch/libgnt/gntwm.c	Mon Oct 01 19:42:10 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>
diff -r e1b73323f28f -r e055690438e7 libpurple/protocols/jabber/google.c
--- a/libpurple/protocols/jabber/google.c	Mon Oct 01 18:07:17 2007 +0000
+++ b/libpurple/protocols/jabber/google.c	Mon Oct 01 19:42:10 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;
 	}
diff -r e1b73323f28f -r e055690438e7 libpurple/protocols/jabber/jabber.c
diff -r e1b73323f28f -r e055690438e7 libpurple/protocols/jabber/jutil.h
--- a/libpurple/protocols/jabber/jutil.h	Mon Oct 01 18:07:17 2007 +0000
+++ b/libpurple/protocols/jabber/jutil.h	Mon Oct 01 19:42:10 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;
diff -r e1b73323f28f -r e055690438e7 libpurple/protocols/msn/directconn.c
diff -r e1b73323f28f -r e055690438e7 libpurple/protocols/msn/msn.c
diff -r e1b73323f28f -r e055690438e7 libpurple/protocols/msn/servconn.c
diff -r e1b73323f28f -r e055690438e7 libpurple/protocols/myspace/markup.c
diff -r e1b73323f28f -r e055690438e7 libpurple/protocols/myspace/user.c
diff -r e1b73323f28f -r e055690438e7 libpurple/util.c
diff -r e1b73323f28f -r e055690438e7 libpurple/win32/win32dep.c
diff -r e1b73323f28f -r e055690438e7 pidgin/gtkblist.c
diff -r e1b73323f28f -r e055690438e7 pidgin/gtkcellrendererexpander.c
diff -r e1b73323f28f -r e055690438e7 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Oct 01 18:07:17 2007 +0000
+++ b/pidgin/gtkconv.c	Mon Oct 01 19:42:10 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);
diff -r e1b73323f28f -r e055690438e7 pidgin/gtkimhtmltoolbar.c
diff -r e1b73323f28f -r e055690438e7 pidgin/gtkmain.c
diff -r e1b73323f28f -r e055690438e7 pidgin/gtknotify.c
--- a/pidgin/gtknotify.c	Mon Oct 01 18:07:17 2007 +0000
+++ b/pidgin/gtknotify.c	Mon Oct 01 19:42:10 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)
diff -r e1b73323f28f -r e055690438e7 pidgin/gtkprefs.c