# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1194581257 0
# Node ID 50a93945811be02e6de9d34a3bcfe4468e271d25
# Parent  e4c986ae75b1f3431e412fcc69ce71a135e12d73# Parent  4ce3e1f998f6d64a9cfd4d901b0670974a2a4690
merge of '54be730b876d8dcb239390730afc8620f96bc429'
     and '63da2a499b2f4ac3db09eb4d2d464e492ac55af9'

diff -r e4c986ae75b1 -r 50a93945811b pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Fri Nov 09 01:41:27 2007 +0000
+++ b/pidgin/gtkblist.c	Fri Nov 09 04:07:37 2007 +0000
@@ -605,6 +605,8 @@
 			return;
 	}
 
+	pidgin_blist_tooltip_destroy();
+
 	path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
 	g_object_set(G_OBJECT(gtkblist->text_rend), "editable", TRUE, NULL);
 	gtk_tree_view_set_enable_search (GTK_TREE_VIEW(gtkblist->treeview), FALSE);
@@ -2800,6 +2802,12 @@
 	GtkTreeIter iter;
 	PurpleBlistNode *node;
 	GValue val;
+	gboolean editable = FALSE;
+
+	/* If we're editing a cell (e.g. alias editing), don't show the tooltip */
+	g_object_get(G_OBJECT(gtkblist->text_rend), "editable", &editable, NULL);
+	if (editable)
+		return FALSE;
 
 	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y + (gtkblist->tip_rect.height/2), 
 		&path, NULL, NULL, NULL))
@@ -3856,7 +3864,7 @@
 	gtk_widget_set_sensitive(widget, pidgin_blist_joinchat_is_showable());
 
 	widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Privacy"));
-	gtk_widget_set_sensitive(widget, (purple_connections_get_all() != NULL));
+	gtk_widget_set_sensitive(widget, sensitive);
 
 	widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Room List"));
 	gtk_widget_set_sensitive(widget, pidgin_roomlist_is_showable());