[Pspp-cvs] psppire ./TODO ./gui_aux.make src/error-dialog....

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    psppire
Branch:         
Changes by:     John Darrington <address@hidden>        06/01/29 05:12:59

Modified files:
        .              : TODO gui_aux.make 
        src            : error-dialog.c menu-actions.c 
                         psppire-data-store.h 

Log message:
        Changed code to be compatible with recent pspp check-in

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/TODO.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/gui_aux.make.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/error-dialog.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/menu-actions.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/psppire-data-store.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: psppire/TODO
diff -u psppire/TODO:1.21 psppire/TODO:1.22
--- psppire/TODO:1.21   Sat Jan 28 08:48:07 2006
+++ psppire/TODO        Sun Jan 29 05:12:59 2006
@@ -40,6 +40,7 @@
 Things Requiring Immediate Attention
 ------------------------------------
 * Comment the code better.
+* Adding variables doesn't update the variable sheet.
 * Row title buttons need to be disabled for non-populated rows.
 * In data sheet, incomplete entries (eg dates) causes error dialogs.
 * Annoying error dialogs in var sheet (eg when entering var name "gender").
Index: psppire/gui_aux.make
diff -u psppire/gui_aux.make:1.9 psppire/gui_aux.make:1.10
--- psppire/gui_aux.make:1.9    Mon Dec 19 06:45:02 2005
+++ psppire/gui_aux.make        Sun Jan 29 05:12:59 2006
@@ -12,13 +12,16 @@
     value-labels.o \
     missing-values.o \
     case.o \
+    casefile.o \
     format.o \
     lex-def.o \
     filename.o \
     file-handle-def.o \
+    mkfile.o \
     settings.o \
     sfm-write.o \
     sfm-read.o \
+    scratch-handle.o \
     calendar.o \
     data-in.o \
     data-out.o \
Index: psppire/src/error-dialog.c
diff -u psppire/src/error-dialog.c:1.3 psppire/src/error-dialog.c:1.4
--- psppire/src/error-dialog.c:1.3      Sat Jan 28 08:48:08 2006
+++ psppire/src/error-dialog.c  Sun Jan 29 05:12:59 2006
@@ -157,3 +157,9 @@
 }
 
 
+void
+err_failure(void)
+{
+  msg(FE, _("Terminating NOW due to fatal error"));
+  gtk_main_quit();
+}
Index: psppire/src/menu-actions.c
diff -u psppire/src/menu-actions.c:1.1 psppire/src/menu-actions.c:1.2
--- psppire/src/menu-actions.c:1.1      Sat Jan 28 08:48:08 2006
+++ psppire/src/menu-actions.c  Sun Jan 29 05:12:59 2006
@@ -149,7 +149,7 @@
          fh_free(psppire_handle);
 
        psppire_handle = 
-         fh_create (handle_name, filename, fh_default_properties());
+         fh_create_file (handle_name, filename, fh_default_properties());
 
        if ( !psppire_handle ) 
          {
@@ -239,7 +239,7 @@
       if ( *handle ) 
        destroy_file_handle(*handle, 0);
 #endif
-      *handle = fh_create (handle_name, filename, fh_default_properties());
+      *handle = fh_create_file (handle_name, filename, 
fh_default_properties());
 
       psppire_set_window_title(basename(filename));
 
Index: psppire/src/psppire-data-store.h
diff -u psppire/src/psppire-data-store.h:1.1 
psppire/src/psppire-data-store.h:1.2
--- psppire/src/psppire-data-store.h:1.1        Sat Jan 28 08:48:08 2006
+++ psppire/src/psppire-data-store.h    Sun Jan 29 05:12:59 2006
@@ -86,6 +86,9 @@
 
 void psppire_data_store_show_labels(PsppireDataStore *store, gboolean 
show_labels);
 
+
+struct file_handle;
+
 void psppire_data_store_create_system_file(PsppireDataStore *store,
                                   struct file_handle *handle);