# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1220568986 0
# Node ID 5a96b250b36dc31e1a1f061a68ab005713478b06
# Parent  85bed17fe5c134f93b2d73ca1aea36a5966df7ab# Parent  635b7cd191100c83543e72247b565b6b86c04e46
merge of '44df11dd9d1db0245be1ab1ac5410821b1c9f2af'
     and '47119315e21668ee63084a57c70abbbba5400cb4'

diff -r 635b7cd19110 -r 5a96b250b36d libpurple/sslconn.h
--- a/libpurple/sslconn.h	Thu Sep 04 22:45:17 2008 +0000
+++ b/libpurple/sslconn.h	Thu Sep 04 22:56:26 2008 +0000
@@ -67,7 +67,7 @@
 	int fd;
 	/** Glib event source ID; used to refer to the received data callback 
 	 * in the glib eventloop */
-	int inpa;
+	guint inpa;
 	/** Data related to the underlying TCP connection */
 	PurpleProxyConnectData *connect_data;
 
diff -r 635b7cd19110 -r 5a96b250b36d pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu Sep 04 22:45:17 2008 +0000
+++ b/pidgin/gtkconv.c	Thu Sep 04 22:56:26 2008 +0000
@@ -7183,6 +7183,14 @@
 			pidgin_conv_update_buddy_icon(conv);
 		}
 	}
+
+	/* Make the tabs show/hide correctly */
+	for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
+		PidginWindow *win = l->data;
+		if (pidgin_conv_window_get_gtkconv_count(win) == 1)
+			gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
+						   GPOINTER_TO_INT(value) == 0);
+	}
 }
 
 static void