diff options
| author | António Fernandes <antoniof@gnome.org> | 2021-12-31 14:33:47 +0000 |
|---|---|---|
| committer | António Fernandes <antoniof@gnome.org> | 2022-01-05 11:32:12 +0000 |
| commit | 51d0c9e799555f50d70215cf9f5ae1716eec6a84 (patch) | |
| tree | 3bd89eea84cb64806479eec0246e90cdfec0f238 | |
| parent | 8bd05a04f5d1b0392935d3dfd3028b46433467d0 (diff) | |
| download | nautilus-51d0c9e799555f50d70215cf9f5ae1716eec6a84.tar.gz | |
pathbar: Change .button_menu_popover type
This is going to make porting to GTK 4 easier because
gtk_widget_unparent() expects a GtkWidget.
| -rw-r--r-- | src/nautilus-pathbar.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c index 9c95f67de..dbe30162e 100644 --- a/src/nautilus-pathbar.c +++ b/src/nautilus-pathbar.c @@ -101,7 +101,7 @@ struct _NautilusPathBar NautilusFile *context_menu_file; GtkPopover *current_view_menu_popover; GtkWidget *current_view_menu_button; - GtkPopover *button_menu_popover; + GtkWidget *button_menu_popover; GMenu *current_view_menu; GMenu *extensions_section; GMenu *templates_submenu; @@ -258,8 +258,8 @@ nautilus_path_bar_init (NautilusPathBar *self) g_error ("Failed to add pathbar-context-menu.ui: %s", error->message); } self->button_menu = g_object_ref_sink (G_MENU (gtk_builder_get_object (builder, "button-menu"))); - self->button_menu_popover = g_object_ref_sink (GTK_POPOVER (gtk_popover_new_from_model (NULL, - G_MENU_MODEL (self->button_menu)))); + self->button_menu_popover = g_object_ref_sink (gtk_popover_new_from_model (NULL, + G_MENU_MODEL (self->button_menu))); /* Add current location menu, which matches the view's background context menu */ gtk_builder_add_from_resource (builder, @@ -487,7 +487,7 @@ button_clicked_cb (GtkButton *button, static void real_pop_up_pathbar_context_menu (NautilusPathBar *self) { - gtk_popover_popup (self->button_menu_popover); + gtk_popover_popup (GTK_POPOVER (self->button_menu_popover)); } static void @@ -602,7 +602,7 @@ on_multi_press_gesture_pressed (GtkGestureMultiPress *gesture, } else { - gtk_popover_set_relative_to (self->button_menu_popover, + gtk_popover_set_relative_to (GTK_POPOVER (self->button_menu_popover), button_data->button); pop_up_pathbar_context_menu (self, button_data->file); } |