From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 14 May 2009 07:48:14 +0000 (+0800)
Subject: Remove unneeded object members
X-Git-Tag: v0.7.3~124
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73d03a239e23f6adb9b4c5a3596abed8c0198ca0;p=pspp-builds.git

Remove unneeded object members
---

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index c53e2fe0..1df084c1 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -1850,28 +1850,29 @@ psppire_data_window_init (PsppireDataWindow *de)
 		      de);
   }
 
-  de->data_sheet_variable_popup_menu =
-    GTK_MENU (create_data_sheet_variable_popup_menu (de));
-
-  de->var_sheet_variable_popup_menu =
-    GTK_MENU (create_var_sheet_variable_popup_menu (de));
+  {
+    GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
 
-  de->data_sheet_cases_popup_menu =
-    GTK_MENU (create_data_sheet_cases_popup_menu (de));
+    PSPPIRE_WINDOW (de)->menu =
+      GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
+  }
 
   {
-  GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
+    GtkMenu *data_sheet_variable_popup_menu =
+      GTK_MENU (create_data_sheet_variable_popup_menu (de));
 
-  PSPPIRE_WINDOW (de)->menu =
-    GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
-  }
+    GtkMenu *var_sheet_variable_popup_menu =
+      GTK_MENU (create_var_sheet_variable_popup_menu (de));
 
+    GtkMenu *data_sheet_cases_popup_menu =
+      GTK_MENU (create_data_sheet_cases_popup_menu (de));
 
-  g_object_set (de->data_editor,
-		"datasheet-column-menu", de->data_sheet_variable_popup_menu,
-		"datasheet-row-menu", de->data_sheet_cases_popup_menu,
-		"varsheet-row-menu", de->var_sheet_variable_popup_menu,
-		NULL);
+    g_object_set (de->data_editor,
+		  "datasheet-column-menu", data_sheet_variable_popup_menu,
+		  "datasheet-row-menu", data_sheet_cases_popup_menu,
+		  "varsheet-row-menu", var_sheet_variable_popup_menu,
+		  NULL);
+  }
 
   gtk_widget_show (GTK_WIDGET (de->data_editor));
   gtk_widget_show (box);
diff --git a/src/ui/gui/psppire-data-window.h b/src/ui/gui/psppire-data-window.h
index 1b6deab1..34a4cee0 100644
--- a/src/ui/gui/psppire-data-window.h
+++ b/src/ui/gui/psppire-data-window.h
@@ -59,10 +59,11 @@ struct _PsppireDataWindow
   GtkAction *delete_cases;
 
 
+#if 0
   GtkMenu *data_sheet_variable_popup_menu;
   GtkMenu *data_sheet_cases_popup_menu;
   GtkMenu *var_sheet_variable_popup_menu;
-
+#endif
 
   gboolean save_as_portable;
 };