[nautilus/2101-tabs-are-missing-context-menu] window: Set tab menu model in UI definition

[António Fernandes <antoniof src gnome org>]

commit 14d93be3c902f2670e972eef61daaff8e58daf25
Author: António Fernandes <antoniof gnome org>
Date:   Mon Jan 10 00:36:56 2022 +0000

    window: Set tab menu model in UI definition

 src/nautilus-window.c               | 4 ----
 src/resources/ui/nautilus-window.ui | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 93d3b56ff..7cc676ac5 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -147,7 +147,6 @@ struct _NautilusWindow
     gulong bookmarks_id;
 
     GtkWidget *tab_menu;
-    GMenuModel *tab_menu_model;
 
     GQueue *tab_data_queue;
 };
@@ -2601,8 +2600,6 @@ nautilus_window_init (NautilusWindow *window)
                              G_CONNECT_SWAPPED);
 
     gtk_widget_set_parent (window->tab_menu, GTK_WIDGET (window));
-    gtk_popover_menu_set_menu_model (GTK_POPOVER_MENU (window->tab_menu),
-                                     G_MENU_MODEL (window->tab_menu_model));
 
     g_signal_connect (window, "notify::is-maximized",
                       G_CALLBACK (on_is_maximized_changed), NULL);
@@ -2675,7 +2672,6 @@ nautilus_window_class_init (NautilusWindowClass *class)
     gtk_widget_class_bind_template_child (wclass, NautilusWindow, main_view);
     gtk_widget_class_bind_template_child (wclass, NautilusWindow, notebook);
     gtk_widget_class_bind_template_child (wclass, NautilusWindow, tab_menu);
-    gtk_widget_class_bind_template_child (wclass, NautilusWindow, tab_menu_model);
     gtk_widget_class_bind_template_child (wclass, NautilusWindow, in_app_notification_undo);
     gtk_widget_class_bind_template_child (wclass, NautilusWindow, in_app_notification_undo_label);
     gtk_widget_class_bind_template_child (wclass, NautilusWindow, in_app_notification_undo_undo_button);
diff --git a/src/resources/ui/nautilus-window.ui b/src/resources/ui/nautilus-window.ui
index cc033a153..e5b7d2834 100644
--- a/src/resources/ui/nautilus-window.ui
+++ b/src/resources/ui/nautilus-window.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <object class="GtkPopoverMenu" id="tab_menu"/>
   <menu id="tab_menu_model">
     <section>
       <item>
@@ -26,6 +25,9 @@
       </item>
     </section>
   </menu>
+  <object class="GtkPopoverMenu" id="tab_menu">
+    <property name="menu-model">tab_menu_model</property>
+  </object>
   <template class="NautilusWindow" parent="AdwApplicationWindow">
     <property name="show-menubar">False</property>
     <property name="title" translatable="yes">_Files</property>