im.pidgin.pidgin: 679333d47d0d179f9027ef1c5f82a2eef5811b95

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 679333d47d0d179f9027ef1c5f82a2eef5811b95
Ancestor: 24f58c58bb8d22c0e8e6c5ce43c536c47b719bc6
Author: sadrul at pidgin.im
Date: 2008-02-17T17:14:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/679333d47d0d179f9027ef1c5f82a2eef5811b95

Modified files:
        finch/gntblist.c finch/libgnt/gntwidget.c

ChangeLog: 

Right-clicking on a widget should trigger the context-menu.

-------------- next part --------------
============================================================
--- finch/gntblist.c	f81696245f5b35c7a56218080b492aae719b03a4
+++ finch/gntblist.c	7c84bf7c3d3eb5b4fc06e22f63af8720d3c5e277
@@ -601,10 +601,10 @@ finch_request_add_buddy(PurpleAccount *a
 	field = purple_request_field_string_new("screenname", _("Screen Name"), username, FALSE);
 	purple_request_field_group_add_field(group, field);
 
-	field = purple_request_field_string_new("alias", _("Alias"), alias, FALSE);
+	field = purple_request_field_string_new("alias", _("Alias (optional)"), alias, FALSE);
 	purple_request_field_group_add_field(group, field);
 
-	field = purple_request_field_string_new("group", _("Group"), grp, FALSE);
+	field = purple_request_field_string_new("group", _("Add in group"), grp, FALSE);
 	purple_request_field_group_add_field(group, field);
 	purple_request_field_set_type_hint(field, "group");
 
@@ -1408,7 +1408,6 @@ finch_blist_remove_node_cb(PurpleBlistNo
 	char *primary;
 	const char *name, *sec = NULL;
 
-	/* XXX: could be a contact */
 	if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
 		PurpleContact *c = (PurpleContact*)node;
 		name = purple_contact_get_alias(c);
@@ -2349,15 +2348,6 @@ blist_node_compare_log(PurpleBlistNode *
 	return ret;
 }
 
-static gboolean
-blist_clicked(GntTree *tree, GntMouseEvent event, int x, int y, gpointer ggblist)
-{
-	if (event == GNT_RIGHT_MOUSE_DOWN) {
-		draw_context_menu(ggblist);
-	}
-	return FALSE;
-}
-
 static void
 plugin_action(GntMenuItem *item, gpointer data)
 {
@@ -2940,7 +2930,6 @@ blist_show(PurpleBuddyList *list)
 	g_signal_connect(G_OBJECT(ggblist->tree), "key_pressed", G_CALLBACK(key_pressed), ggblist);
 	g_signal_connect(G_OBJECT(ggblist->tree), "context-menu", G_CALLBACK(context_menu), ggblist);
 	g_signal_connect(G_OBJECT(ggblist->tree), "collapse-toggled", G_CALLBACK(group_collapsed), NULL);
-	g_signal_connect_after(G_OBJECT(ggblist->tree), "clicked", G_CALLBACK(blist_clicked), ggblist);
 	g_signal_connect(G_OBJECT(ggblist->tree), "activate", G_CALLBACK(selection_activate), ggblist);
 	g_signal_connect_data(G_OBJECT(ggblist->tree), "gained-focus", G_CALLBACK(draw_tooltip),
 				ggblist, 0, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
============================================================
--- finch/libgnt/gntwidget.c	f30e3d47ef942aa4b386705d18d149be8bbdce16
+++ finch/libgnt/gntwidget.c	6327cdbbd0da94ea61aa1bfa2476db0a3692a14a
@@ -407,6 +407,8 @@ gnt_widget_clicked(GntWidget *widget, Gn
 {
 	gboolean ret;
 	g_signal_emit(widget, signals[SIG_CLICKED], 0, event, x, y, &ret);
+	if (!ret && event == GNT_RIGHT_MOUSE_DOWN)
+		ret = gnt_bindable_perform_action_named(GNT_BINDABLE(widget), "context-menu", NULL);
 	return ret;
 }