# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1180287943 0
# Node ID be7e6375ce7e1940c29f36e774c7db8c233ff8f9
# Parent  4d53be63a5588a377e1c52ff7fb9786d51dcd51e# Parent  0f65c1856f551c15a95006631827361ee0b12195
merge of '15c67573c5441bdd943fcf07e496016c58492c19'
     and '667956be4f81c42d9061470e5111d09a1516db33'

diff -r 4d53be63a558 -r be7e6375ce7e libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Sun May 27 02:11:53 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Sun May 27 17:45:43 2007 +0000
@@ -901,6 +901,7 @@
 syn_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
+	MsnSync *sync;
 	int total_users;
 
 	session = cmdproc->session;
@@ -919,22 +920,12 @@
 
 	total_users  = atoi(cmd->params[2]);
 
-	if (total_users == 0)
-	{
-		msn_session_finish_login(session);
-	}
-	else
-	{
-		/* syn_table */
-		MsnSync *sync;
+	sync = msn_sync_new(session);
+	sync->total_users = total_users;
+	sync->old_cbs_table = cmdproc->cbs_table;
 
-		sync = msn_sync_new(session);
-		sync->total_users = total_users;
-		sync->old_cbs_table = cmdproc->cbs_table;
-
-		session->sync = sync;
-		cmdproc->cbs_table = sync->cbs_table;
-	}
+	session->sync = sync;
+	cmdproc->cbs_table = sync->cbs_table;
 }
 
 /**************************************************************************
diff -r 4d53be63a558 -r be7e6375ce7e libpurple/protocols/msn/sync.c
--- a/libpurple/protocols/msn/sync.c	Sun May 27 02:11:53 2007 +0000
+++ b/libpurple/protocols/msn/sync.c	Sun May 27 17:45:43 2007 +0000
@@ -99,8 +99,19 @@
 
 	/* HACK */
 	if (group_id == 0)
+	{
 		/* Group of ungroupped buddies */
+		if (session->sync->total_users == 0)
+		{
+			cmdproc->cbs_table = session->sync->old_cbs_table;
+
+			msn_session_finish_login(session);
+
+			msn_sync_destroy(session->sync);
+			session->sync = NULL;
+		}
 		return;
+	}
 
 	if ((purple_find_group(name)) == NULL)
 	{
diff -r 4d53be63a558 -r be7e6375ce7e pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sun May 27 02:11:53 2007 +0000
+++ b/pidgin/gtkconv.c	Sun May 27 17:45:43 2007 +0000
@@ -7802,7 +7802,9 @@
 	entry = gtk_entry_new();
 	gtk_entry_set_has_frame(GTK_ENTRY(entry), FALSE);
 	gtk_entry_set_width_chars(GTK_ENTRY(entry), 10);
+#if GTK_CHECK_VERSION(2,4,0)
 	gtk_entry_set_alignment(GTK_ENTRY(entry), 0.5);
+#endif
 
 	gtk_box_pack_start(GTK_BOX(gtkconv->tabby), entry, TRUE, TRUE, 0);
 	/* after the tab label */
@@ -8224,7 +8226,9 @@
 	}
 
 	ebox = gtk_event_box_new();
+#if GTK_CHECK_VERSION(2,4,0)
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
+#endif
 	gtk_container_add(GTK_CONTAINER(ebox), gtkconv->tabby);
 	g_signal_connect(G_OBJECT(ebox), "button-press-event",
 					G_CALLBACK(alias_double_click_cb), gtkconv);
diff -r 4d53be63a558 -r be7e6375ce7e pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Sun May 27 02:11:53 2007 +0000
+++ b/pidgin/gtkimhtml.c	Sun May 27 17:45:43 2007 +0000
@@ -4433,7 +4433,9 @@
 
 	if (imhtml_smiley && imhtml_smiley->flags & GTK_IMHTML_SMILEY_CUSTOM) {
 		ebox = gtk_event_box_new();
+#if GTK_CHECK_VERSION(2,4,0)
 		gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
+#endif
 		gtk_widget_show(ebox);
 	}