changeset
Remove the use of the removed popup-menu signal and fix the popup menu not displaying
Thu, 25 Aug 2022 22:30:30 -0500
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Thu, 25 Aug 2022 22:30:30 -0500
- branch
- gtk4
- changeset 41594
- 30ad4d17661f
- parent 41593
- 6928f02e807a
- child 41595
- 61d8f39f3d70
Remove the use of the removed popup-menu signal and fix the popup menu not displaying
Testing Done:
Double clicked a buddy to open a conversation and right clicked a buddy to make sure the contact menu came up.
Reviewed at https://reviews.imfreedom.org/r/1651/
| pidgin/gtkblist.c | file | annotate | diff | comparison | revisions |
--- a/pidgin/gtkblist.c Thu Aug 25 22:29:50 2022 -0500 +++ b/pidgin/gtkblist.c Thu Aug 25 22:30:30 2022 -0500 @@ -1664,27 +1664,6 @@ #endif gtk_tree_path_free(path); - return FALSE; -} - -static gboolean -pidgin_blist_popup_menu_cb(GtkWidget *tv, gpointer data) -{ - PidginBuddyList *gtkblist = data; - PurpleBlistNode *node; - GtkTreeIter iter; - GtkTreeSelection *sel; - gboolean handled = FALSE; - - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv)); - if (!gtk_tree_selection_get_selected(sel, NULL, &iter)) - return FALSE; - - gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1); - - /* Shift+F10 draws a context menu */ - handled = pidgin_blist_show_context_menu(tv, node, -1, -1); - return handled; } @@ -3114,6 +3093,7 @@ G_CALLBACK(gtk_blist_row_collapsed_cb), gtkblist); click = gtk_gesture_click_new(); + gtk_gesture_single_set_button(GTK_GESTURE_SINGLE(click), 0); g_signal_connect(click, "pressed", G_CALLBACK(gtk_blist_button_press_cb), gtkblist); gtk_widget_add_controller(gtkblist->treeview, GTK_EVENT_CONTROLLER(click)); @@ -3123,9 +3103,6 @@ G_CALLBACK(pidgin_blist_key_press_cb), gtkblist); gtk_widget_add_controller(gtkblist->treeview, key_controller); - g_signal_connect(gtkblist->treeview, "popup-menu", - G_CALLBACK(pidgin_blist_popup_menu_cb), gtkblist); - /* Enable CTRL+F searching */ gtk_tree_view_set_search_column(GTK_TREE_VIEW(gtkblist->treeview), NAME_COLUMN); gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(gtkblist->treeview),
