[nautilus/wip/antoniof/experimental-gtk4-build: 34/52] No more GtkWidget::popup-menu




commit cfd6dc2f7bcdfe1296401df42c67deaeb5d90061
Author: António Fernandes <antoniof gnome org>
Date:   Thu Dec 23 16:00:03 2021 +0000

    No more GtkWidget::popup-menu

 src/nautilus-files-view.c | 24 ------------------------
 src/nautilus-toolbar.c    | 16 ----------------
 src/nautilus-window.c     | 12 ------------
 3 files changed, 52 deletions(-)
---
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 1989e7a55..a09b6de04 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -8312,25 +8312,6 @@ nautilus_files_view_pop_up_background_context_menu (NautilusFilesView *view,
     gtk_popover_popup (GTK_POPOVER (priv->background_menu));
 }
 
-static gboolean
-popup_menu_callback (NautilusFilesView *view)
-{
-    g_autolist (NautilusFile) selection = NULL;
-
-    selection = nautilus_view_get_selection (NAUTILUS_VIEW (view));
-
-    if (selection != NULL)
-    {
-        nautilus_files_view_pop_up_selection_context_menu (view, -1, -1);
-    }
-    else
-    {
-        nautilus_files_view_pop_up_background_context_menu (view, 0, 0);
-    }
-
-    return TRUE;
-}
-
 static void
 schedule_update_context_menus (NautilusFilesView *view)
 {
@@ -9578,11 +9559,6 @@ nautilus_files_view_init (NautilusFilesView *view)
                       G_CALLBACK (on_scroll),
                       view);
 
-    g_signal_connect_swapped (priv->scrolled_window,
-                              "popup-menu",
-                              G_CALLBACK (popup_menu_callback),
-                              view);
-
     gtk_overlay_set_child (GTK_OVERLAY (priv->overlay), priv->scrolled_window);
 
     /* Empty states */
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index 9c55f7fe9..76fdf1042 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -757,20 +757,6 @@ on_location_entry_close (GtkWidget       *close_button,
     nautilus_toolbar_set_show_location_entry (self, FALSE);
 }
 
-static gboolean
-on_location_entry_populate_popup (GtkEntry  *entry,
-                                  GtkWidget *widget,
-                                  gpointer   user_data)
-{
-    NautilusToolbar *toolbar;
-
-    toolbar = user_data;
-
-    toolbar->location_entry_should_auto_hide = FALSE;
-
-    return GDK_EVENT_PROPAGATE;
-}
-
 static void
 on_location_entry_focus_changed (GObject    *object,
                                  GParamSpec *pspec,
@@ -868,8 +854,6 @@ nautilus_toolbar_constructed (GObject *object)
                       (GCallback) gtk_widget_grab_focus, NULL);
     g_signal_connect_swapped (self->operations_popover, "closed",
                               (GCallback) gtk_widget_grab_focus, self);
-    g_signal_connect (self->location_entry, "populate-popup",
-                      G_CALLBACK (on_location_entry_populate_popup), self);
     g_signal_connect (self->location_entry, "notify::has-focus",
                       G_CALLBACK (on_location_entry_focus_changed), self);
 
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index af9560b26..3026e27bd 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1815,15 +1815,6 @@ notebook_button_press_cb (GtkGestureClick *gesture,
     }
 }
 
-static gboolean
-notebook_popup_menu_cb (GtkWidget *widget,
-                        gpointer   user_data)
-{
-    NautilusWindow *window = user_data;
-    notebook_popup_menu_show (window, 0, 0);
-    return TRUE;
-}
-
 GtkWidget *
 nautilus_window_get_toolbar (NautilusWindow *window)
 {
@@ -1941,9 +1932,6 @@ notebook_create_window_cb (GtkNotebook *notebook,
 static void
 setup_notebook (NautilusWindow *window)
 {
-    g_signal_connect (window->notebook, "popup-menu",
-                      G_CALLBACK (notebook_popup_menu_cb),
-                      window);
     g_signal_connect (window->notebook, "switch-page",
                       G_CALLBACK (notebook_switch_page_cb),
                       window);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]