# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1188352005 0
# Node ID e2b7dadac41534c917315f744fab954c5ed244ff
# Parent  b62683f4120d4c8ee9dfa95e15f00e7f1aca8d79# Parent  b66909a58e5f9115b0c8fd8a9fc6645725ab54b7
merge of 'ee4f8f7ebf5f6057974f66b75c8b59c199e44ae0'
     and 'f832db29755469f6ba20426b58a55928365406c3'

diff -r b62683f4120d -r e2b7dadac415 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Tue Aug 28 21:17:28 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Aug 29 01:46:45 2007 +0000
@@ -8880,9 +8880,8 @@
 	if (pidgin_conv_window_get_gtkconv_count(win) == 1) 
 		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
 					   purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs") &&
-                                           (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") ||  
-                                           purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_LEFT ||
-                                           purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT));
+                                           (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") ||
+                                           purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") != GTK_POS_TOP));
 
 	/* show the widgets */
 /*	gtk_widget_show(gtkconv->icon); */
diff -r b62683f4120d -r e2b7dadac415 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Tue Aug 28 21:17:28 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Wed Aug 29 01:46:45 2007 +0000
@@ -1394,7 +1394,7 @@
 		return;
 	}
 	gtk_grab_add (box->popup_window);
-	box->popup_in_progress = TRUE;
+//	box->popup_in_progress = TRUE;
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (box->toggle_button),
 				      TRUE);
 
@@ -1590,14 +1590,15 @@
 		    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (status_box->toggle_button))) {
 			pidgin_status_box_popdown (status_box);
 			return TRUE;
+		} else if (ewidget == status_box->toggle_button) {
+			status_box->popup_in_progress = TRUE;		
 		}
 
 		/* released outside treeview */
-		if (ewidget != status_box->toggle_button)
-			{
+		if (ewidget != status_box->toggle_button) {
 				pidgin_status_box_popdown (status_box);
 				return TRUE;
-			}
+		}
 
 		return FALSE;
 	}