PsppireDataWindow: reduce scope of incidental

[pspp] / src / ui / gui / psppire-data-window.c

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 813959dd76d488a32fce5b500601a3335aba4001..5c1b48dc833efcf71b1fc3488ee4e85ce44f09d5 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -156,15 +156,18 @@ transformation_change_callback (bool transformations_pending,
 {
   PsppireDataWindow  *de = PSPPIRE_DATA_WINDOW (data);
 
-  GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
-
-  GtkWidget *menuitem =
-    gtk_ui_manager_get_widget (uim,"/ui/menubar/transform/transform_run-pending");
-
   GtkWidget *status_label  =
     get_widget_assert (de->builder, "case-counter-area");
 
-  gtk_widget_set_sensitive (menuitem, transformations_pending);
+  { /* Set the sensitivity of the "Transformations Pending" menuitem */
+    GtkUIManager *uim = 
+      GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
+
+    GtkWidget *menuitem =
+      gtk_ui_manager_get_widget (uim,"/ui/menubar/transform/transform_run-pending");
+    
+    gtk_widget_set_sensitive (menuitem, transformations_pending);
+  }
 
 
   if ( transformations_pending)
@@ -944,7 +947,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
   psppire_data_store_set_reader (de->data_store, NULL);
 
   menubar = get_widget_assert (de->builder, "menubar");
-  hb = get_widget_assert (de->builder, "handlebox1");
+  hb = get_widget_assert (de->builder, "toolbar");
   sb = get_widget_assert (de->builder, "status-bar");
 
   de->uim = NULL;
@@ -1089,8 +1092,8 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
 
   g_signal_connect_swapped (get_action_assert (de->builder, "windows_split"), "toggled", G_CALLBACK (toggle_split_window), de);
 
-  merge_help_menu (de->ui_manager);
-
+  gtk_menu_shell_append (GTK_MENU_SHELL (menubar),  create_help_menu (GTK_WINDOW (de)));
+  
   g_signal_connect (de->data_editor, "notify::ui-manager",
                     G_CALLBACK (on_ui_manager_changed), de);
   on_ui_manager_changed (de->data_editor, NULL, de);