# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1271542941 0
# Node ID 2b294edceaede8e5d41b33ba054a7c92a6b6388f
# Parent  4aa17d7c4e0afb3111548f338bf6dc663a26c91a# Parent  e7b9a5ba377710c9e135d5ae0393defd10b01220
merge of '229f226a4d7937c46842e33328e05fc827bf3573'
     and '56dbb07bba4460522cb38830486f96c1d361d78b'

diff -r 4aa17d7c4e0a -r 2b294edceaed libpurple/protocols/msn/switchboard.c
--- a/libpurple/protocols/msn/switchboard.c	Sat Apr 17 01:33:19 2010 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Sat Apr 17 22:22:21 2010 +0000
@@ -937,7 +937,7 @@
 	}
 
 	imgid = purple_imgstore_add_with_id(image_data, image_len, NULL);
-	image_msg = g_strdup_printf("<IMG ID='%d'/>", imgid);
+	image_msg = g_strdup_printf("<IMG ID='%d'>", imgid);
 
 	if (swboard->current_users > 1 ||
 		((swboard->conv != NULL) &&
diff -r 4aa17d7c4e0a -r 2b294edceaed pidgin/plugins/ticker/gtkticker.c
--- a/pidgin/plugins/ticker/gtkticker.c	Sat Apr 17 01:33:19 2010 +0000
+++ b/pidgin/plugins/ticker/gtkticker.c	Sat Apr 17 22:22:21 2010 +0000
@@ -343,7 +343,7 @@
 
 	window = gdk_window_new (gtk_widget_get_parent_window (widget),
 			&attributes, attributes_mask);
-#if GTK_CHECK_VERSION(2,14,0)
+#if GTK_CHECK_VERSION(2,18,0)
 	gtk_widget_set_window (widget, window);
 #else
 	widget->window = window;