From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 2 Dec 2012 03:39:07 +0000 (-0800)
Subject: Merge 'master' into 'psppsheet'.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fbuilds%2F20121229032201%2Fpspp;p=pspp

Merge 'master' into 'psppsheet'.
---

fa1fffd5c789d9c7875fc3bdf556eaf017cf524e
diff --cc src/ui/gui/automake.mk
index ea1f06df8b,6d3b6d0ec3..8cba97018b
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@@ -177,8 -176,8 +175,6 @@@ src_ui_gui_psppire_SOURCES = 
  	src/ui/gui/chi-square-dialog.h \
  	src/ui/gui/count-dialog.c \
  	src/ui/gui/count-dialog.h \
- 	src/ui/gui/crosstabs-dialog.c \
- 	src/ui/gui/crosstabs-dialog.h \
 -	src/ui/gui/customentry.c \
 -	src/ui/gui/customentry.h \
  	src/ui/gui/dialog-common.c \
  	src/ui/gui/dialog-common.h \
  	src/ui/gui/dict-display.h \
diff --cc src/ui/gui/psppire-data-window.c
index ad967b3256,9e5860b719..73c98b383e
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@@ -32,10 -31,10 +31,8 @@@
  #include "ui/gui/comments-dialog.h"
  #include "ui/gui/compute-dialog.h"
  #include "ui/gui/count-dialog.h"
- #include "ui/gui/crosstabs-dialog.h"
  #include "ui/gui/entry-dialog.h"
  #include "ui/gui/executor.h"
- #include "ui/gui/frequencies-dialog.h"
 -#include "ui/gui/find-dialog.h"
 -#include "ui/gui/goto-case-dialog.h"
  #include "ui/gui/help-menu.h"
  #include "ui/gui/helper.h"
  #include "ui/gui/helper.h"
@@@ -835,6 -909,19 +832,18 @@@ connect_action (PsppireDataWindow *dw, 
    return action;
  }
  
+ /* Only a data file with at least one variable can be saved. */
+ static void
+ enable_save (PsppireDataWindow *dw)
+ {
 -  PsppireDict *dict = dw->var_store->dictionary;
 -  gboolean enable = psppire_dict_get_var_cnt (dict) > 0;
++  gboolean enable = psppire_dict_get_var_cnt (dw->dict) > 0;
+ 
+   gtk_action_set_sensitive (get_action_assert (dw->builder, "file_save"),
+                             enable);
+   gtk_action_set_sensitive (get_action_assert (dw->builder, "file_save_as"),
+                             enable);
+ }
+ 
  /* Initializes as much of a PsppireDataWindow as we can and must before the
     dataset has been set.
  
@@@ -921,7 -1018,18 +930,14 @@@ psppire_data_window_finish_init (Psppir
  		    G_CALLBACK (on_split_change),
  		    de);
  
 -  g_signal_connect_swapped (dict, "backend-changed",
++  g_signal_connect_swapped (de->dict, "backend-changed",
+                             G_CALLBACK (enable_save), de);
 -  g_signal_connect_swapped (dict, "variable-inserted",
++  g_signal_connect_swapped (de->dict, "variable-inserted",
+                             G_CALLBACK (enable_save), de);
 -  g_signal_connect_swapped (dict, "variable-deleted",
++  g_signal_connect_swapped (de->dict, "variable-deleted",
+                             G_CALLBACK (enable_save), de);
+   enable_save (de);
  
 -  connect_action (de, "edit_copy", G_CALLBACK (on_edit_copy));
 -
 -  connect_action (de, "edit_cut", G_CALLBACK (on_edit_cut));
 -
    connect_action (de, "file_new_data", G_CALLBACK (create_data_window));
  
    connect_action (de, "file_import-text", G_CALLBACK (text_data_import_assistant));