change code to get back a GData instead of GArray of features.

src/zmapWindow/GFF_scaffold.c

-/*  Last edited: Jun 18 10:50 2004 (edgrif) */
+/*  Last edited: Jun 22 12:05 2004 (edgrif) */
 /* This is a temporary file only to help with testing....it will go once GFF code is combined
  * into the threads etc. code proper.... */
 
@@ -8,12 +8,12 @@
 #include <ZMap/zmapConfig.h>
 
 
-static GArray *parseGFF(char *filename) ;
+static GData *parseGFF(char *filename) ;
 
 
-GArray *testGetGFF(void)
+GData *testGetGFF(void)
 {
-  GArray *features = NULL ;
+  GData *features = NULL ;
   ZMapConfig config ;
   char *GFF_file = NULL ;
 
@@ -57,9 +57,9 @@ GArray *testGetGFF(void)
 
 
 
-static GArray *parseGFF(char *filename)
+static GData *parseGFF(char *filename)
 {
-  GArray *features = NULL ;
+  GData *features = NULL ;
   GIOChannel* gff_file ;
   GError *gff_file_err = NULL ;
 
@@ -70,13 +70,13 @@ static GArray *parseGFF(char *filename)
       GString* gff_line ;
       GIOStatus status ;
       gsize terminator_pos = 0 ;
-      gboolean free_arrays = FALSE ;
+      gboolean free_arrays = FALSE, parse_only = FALSE ;
 
 
       gff_line = g_string_sized_new(2000) ;		    /* Probably not many lines will be >
 							       2k chars. */
 
-      parser = zMapGFFCreateParser() ;
+      parser = zMapGFFCreateParser(parse_only) ;
 
       while ((status = g_io_channel_read_line_string(gff_file, gff_line, &terminator_pos,
 						     &gff_file_err)) == G_IO_STATUS_NORMAL)

src/zmapWindow/zmapWindow.c

@@ -28,9 +28,9 @@
  *              
  * Exported functions: See ZMap/zmapWindow.h
  * HISTORY:
- * Last edited: Jun 18 10:59 2004 (edgrif)
+ * Last edited: Jun 22 09:57 2004 (edgrif)
  * Created: Thu Jul 24 14:36:27 2003 (edgrif)
- * CVS info:   $Id: zmapWindow.c,v 1.8 2004-06-18 11:01:44 edgrif Exp $
+ * CVS info:   $Id: zmapWindow.c,v 1.9 2004-06-22 12:25:48 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
@@ -176,7 +176,7 @@ static void dataEventCB(GtkWidget *widget, GdkEventClient *event, gpointer cb_da
       /* OK, can ignore data here and just call my dummied up GFF routine to deliver some
        * features for Rob to draw..... */
       {
-	GArray *features ;
+	GData *features ;
 
 
 	features = testGetGFF() ;

src/zmapWindow/zmapWindow_P.h

@@ -26,9 +26,9 @@
  * Description: 
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Jun 18 10:48 2004 (edgrif)
+ * Last edited: Jun 22 09:57 2004 (edgrif)
  * Created: Fri Aug  1 16:45:58 2003 (edgrif)
- * CVS info:   $Id: zmapWindow_P.h,v 1.5 2004-06-18 11:01:44 edgrif Exp $
+ * CVS info:   $Id: zmapWindow_P.h,v 1.6 2004-06-22 12:25:49 edgrif Exp $
  *-------------------------------------------------------------------
  */
 #ifndef ZMAP_WINDOW_P_H
@@ -75,7 +75,7 @@ GtkWidget *zmapWindowMakeFrame(ZMapWindow window) ;
 
 
 /* TEST SCAFFOLDING............... */
-GArray *testGetGFF(void) ;
+GData *testGetGFF(void) ;