diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-03-19 18:03:16 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-03-19 18:03:16 -0400 |
commit | 31db61588543a1ba0935ac8ecb2ecac574c0a836 (patch) | |
tree | a2e2092e086a9c7d618e2c9ae1fc7b5a659e8a7a /gtk/gtkmountoperation.c | |
parent | 3ac4c76b18cc89a841ce09f0943539f16988fd21 (diff) | |
download | gtk+-31db61588543a1ba0935ac8ecb2ecac574c0a836.tar.gz |
Revert "Merge branch 'disable-window-test' into 'master'"
This reverts commit 3ac4c76b18cc89a841ce09f0943539f16988fd21, reversing
changes made to 6ec96d2e989d029a303b8b20ec72b86f974c0e87.
Diffstat (limited to 'gtk/gtkmountoperation.c')
-rw-r--r-- | gtk/gtkmountoperation.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index a3debb0861..51d926c401 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -57,10 +57,6 @@ #include "gtkpopover.h" #include "gtksnapshot.h" #include "gdktextureprivate.h" -#include "gtkshortcutcontroller.h" -#include "gtkshortcuttrigger.h" -#include "gtkshortcutaction.h" -#include "gtkshortcut.h" #include <glib/gprintf.h> /** @@ -1462,7 +1458,6 @@ do_popup_menu_for_process_tree_view (GtkWidget *widget, static gboolean on_popup_menu_for_process_tree_view (GtkWidget *widget, - GVariant *args, gpointer user_data) { GtkMountOperation *op = GTK_MOUNT_OPERATION (user_data); @@ -1508,10 +1503,6 @@ create_show_processes_dialog (GtkMountOperation *op, gchar *s; gboolean use_header; GtkGesture *gesture; - GtkEventController *controller; - GtkShortcutTrigger *trigger; - GtkShortcutAction *action; - GtkShortcut *shortcut; priv = op->priv; @@ -1598,15 +1589,9 @@ create_show_processes_dialog (GtkMountOperation *op, gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view); gtk_container_add (GTK_CONTAINER (vbox), scrolled_window); - controller = gtk_shortcut_controller_new (); - trigger = gtk_alternative_trigger_new (gtk_keyval_trigger_new (GDK_KEY_F10, GDK_SHIFT_MASK), - gtk_keyval_trigger_new (GDK_KEY_Menu, 0)); - action = gtk_callback_action_new (on_popup_menu_for_process_tree_view, - op, - NULL); - shortcut = gtk_shortcut_new_with_arguments (trigger, action, "s", "sv"); - gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), shortcut); - gtk_widget_add_controller (GTK_WIDGET (tree_view), controller); + g_signal_connect (tree_view, "popup-menu", + G_CALLBACK (on_popup_menu_for_process_tree_view), + op); gesture = gtk_gesture_click_new (); gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY); |