[Pspp-cvs] psppire/src callbacks.c data_sheet.c

[John Darrington]

CVSROOT:        /cvsroot/pspp
Module name:    psppire
Branch:         
Changes by:     John Darrington <address@hidden>        06/01/22 01:22:55

Modified files:
        src            : callbacks.c data_sheet.c 

Log message:
        Fixed up problems with modified API to file_handles

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/callbacks.c.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/data_sheet.c.diff?tr1=1.26&tr2=1.27&r1=text&r2=text

Patches:
Index: psppire/src/callbacks.c
diff -u psppire/src/callbacks.c:1.19 psppire/src/callbacks.c:1.20
--- psppire/src/callbacks.c:1.19        Fri Dec 23 23:34:03 2005
+++ psppire/src/callbacks.c     Sun Jan 22 01:22:55 2006
@@ -85,8 +85,10 @@
 
   psppire_set_window_title(untitled);
 
+  /* 
   if (psppire_handle)
     destroy_file_handle(psppire_handle, 0);
+  */
   psppire_handle = 0 ;
 }
 
@@ -140,11 +142,13 @@
        char *filename = gtk_file_chooser_get_filename
          (GTK_FILE_CHOOSER (dialog));
 
+       /* 
        if ( psppire_handle ) 
          destroy_file_handle(psppire_handle, 0);
+       */
 
-       psppire_handle = 
-         create_file_handle_with_defaults (handle_name, filename);
+       psppire_handle = fh_create (handle_name, filename, 
+                                   fh_default_properties());
 
        if ( !psppire_handle ) 
          {
@@ -270,10 +274,12 @@
       char *filename = gtk_file_chooser_get_filename
        (GTK_FILE_CHOOSER (dialog));
 
+      /* 
       if ( *handle ) 
        destroy_file_handle(*handle, 0);
-      *handle = create_file_handle_with_defaults (handle_name,
-                                                 filename);
+      */
+
+      *handle = fh_create (handle_name, filename, fh_default_properties());
 
       psppire_set_window_title(basename(filename));
 
Index: psppire/src/data_sheet.c
diff -u psppire/src/data_sheet.c:1.26 psppire/src/data_sheet.c:1.27
--- psppire/src/data_sheet.c:1.26       Fri Dec 23 23:34:03 2005
+++ psppire/src/data_sheet.c    Sun Jan 22 01:22:55 2006
@@ -655,7 +655,7 @@
     3 /* version */
   }; 
 
-  g_print("Writing system file %s\n",handle_get_filename(handle));
+  g_print("Writing system file %s\n",fh_get_filename(handle));
   
   struct sfm_writer *writer = sfm_open_writer(handle, d->dict, wo);