nemo-window-menus.c: Update extension and action entries in

the File menu when it is shown.

In 5a271cd action and extension menu items stopped getting
updated when the selection changed, instead updating only just prior
to showing the popup menu.

This implements the same behavior for the menubar.

Fixes #2758

Author: mtwebster

src/nemo-view.c

@@ -10038,8 +10038,8 @@ real_update_menus (NemoView *view)
     nemo_file_list_free (selection);
 }
 
-static void
-update_actions_and_extensions(NemoView *view)
+void
+nemo_view_update_actions_and_extensions (NemoView *view)
 {
     GList *selection;
 
@@ -10076,7 +10076,7 @@ nemo_view_pop_up_selection_context_menu  (NemoView *view,
 	/* Make the context menu items not flash as they update to proper disabled,
 	 * etc. states by forcing menus to update now.
 	 */
-    update_actions_and_extensions (view);
+    nemo_view_update_actions_and_extensions (view);
     update_context_menu_position_from_event (view, event);
 
 	eel_pop_up_context_menu (create_popup_menu
@@ -10102,7 +10102,7 @@ nemo_view_pop_up_background_context_menu (NemoView *view,
 	/* Make the context menu items not flash as they update to proper disabled,
 	 * etc. states by forcing menus to update now.
 	 */
-    update_actions_and_extensions (view);
+    nemo_view_update_actions_and_extensions (view);
     update_context_menu_position_from_event (view, event);
 
 	eel_pop_up_context_menu (create_popup_menu

src/nemo-view.h

@@ -355,6 +355,8 @@ void                nemo_view_notify_selection_changed         (NemoView  *view)
 GtkUIManager *      nemo_view_get_ui_manager                   (NemoView  *view);
 NemoDirectory  *nemo_view_get_model                        (NemoView  *view);
 NemoFile       *nemo_view_get_directory_as_file            (NemoView  *view);
+void            nemo_view_update_actions_and_extensions        (NemoView *view);
+
 void                nemo_view_pop_up_background_context_menu   (NemoView  *view,
 								    GdkEventButton   *event);
 void                nemo_view_pop_up_selection_context_menu    (NemoView  *view,

src/nemo-window-menus.c

@@ -69,6 +69,7 @@
 
 #define MENU_PATH_EXTENSION_ACTIONS                     "/MenuBar/File/Extension Actions"
 #define POPUP_PATH_EXTENSION_ACTIONS                     "/background/Before Zoom Items/Extension Actions"
+#define MENU_BAR_PATH                                    "/MenuBar"
 
 #define NETWORK_URI          "network:"
 #define COMPUTER_URI         "computer:"
@@ -1273,8 +1274,26 @@ action_open_terminal_callback(GtkAction *action, gpointer callback_data)
     g_object_unref (gfile);
 }
 
+static void
+file_menu_bar_item_activated (GtkAction *action, gpointer user_data)
+{
+    NemoWindow *window;
+    NemoView *view;
+
+    window = NEMO_WINDOW (user_data);
+
+    if (window->details->dynamic_menu_entries_current) {
+        return;
+    }
+
+    view = get_current_view (window);
+    nemo_view_update_actions_and_extensions (view);
+
+    window->details->dynamic_menu_entries_current = TRUE;
+}
+
 static const GtkActionEntry main_entries[] = {
-  /* name, stock id, label */  { "File", NULL, N_("_File") },
+  /* name, stock id, label */  { "File", NULL, N_("_File"), NULL, NULL, G_CALLBACK (file_menu_bar_item_activated) },
   /* name, stock id, label */  { "Edit", NULL, N_("_Edit") },
   /* name, stock id, label */  { "View", NULL, N_("_View") },
   /* name, stock id, label */  { "Help", NULL, N_("_Help") },
@@ -1763,6 +1782,16 @@ nemo_window_initialize_actions (NemoWindow *window)
 			  NULL);
 }
 
+static void
+menu_bar_deactivated (GtkMenuShell *menu, gpointer user_data)
+{
+    NemoWindow *window;
+
+    window = NEMO_WINDOW (user_data);
+
+    window->details->dynamic_menu_entries_current = FALSE;
+}
+
 /**
  * nemo_window_initialize_menus
  *
@@ -1774,6 +1803,7 @@ nemo_window_initialize_menus (NemoWindow *window)
 {
 	GtkActionGroup *action_group;
 	GtkUIManager *ui_manager;
+    GtkWidget *menubar;
 	GtkAction *action;
       GtkAction *action_to_hide;
 	gint i;
@@ -1877,6 +1907,14 @@ nemo_window_initialize_menus (NemoWindow *window)
 	/* add the UI */
 	gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/nemo/nemo-shell-ui.xml", NULL);
 
+    // window->details->menubar isn't set yet
+    menubar = gtk_ui_manager_get_widget (window->details->ui_manager, "/MenuBar");
+
+    g_signal_connect (menubar,
+                      "deactivate",
+                      G_CALLBACK (menu_bar_deactivated),
+                      window);
+
 	nemo_window_initialize_trash_icon_monitor (window);
 }
 

src/nemo-window-private.h

@@ -110,6 +110,8 @@ struct NemoWindowDetails
         GList *ignore_meta_column_order;
         gchar *ignore_meta_sort_column;
         gint ignore_meta_sort_direction;
+
+        gboolean dynamic_menu_entries_current;
 };
 
 /* window geometry */