im.pidgin.pidgin: 63da2a499b2f4ac3db09eb4d2d464e492ac55af9

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 63da2a499b2f4ac3db09eb4d2d464e492ac55af9
Ancestor: fe73a4c30100b8f65013f27f2354205dc56dcc35
Author: datallah at pidgin.im
Date: 2007-11-09T04:07:25
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

Don't allow tooltips to interfere with editing blist entries. Fixes #3830.

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	4d1fcc0cac6b1da88db88019f15c58083f76b44d
+++ pidgin/gtkblist.c	08fbcb34489391ed9d5ea9dd6e2e44804429b4ce
@@ -605,6 +605,8 @@ static void gtk_blist_menu_alias_cb(GtkW
 			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,7 +2802,13 @@ static gboolean pidgin_blist_tooltip_tim
 	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))
 		return FALSE;
@@ -3856,7 +3864,7 @@ update_menu_bar(PidginBuddyList *gtkblis
 	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());