ygraph (0.16~cvs20090218-1.1) direct (non packaging) changes

--- ygraph-0.16~cvs20090218.orig/src/util.c
+++ ygraph-0.16~cvs20090218/src/util.c
@@ -399,13 +399,13 @@
     if ((c==global_x_column) || (c==global_y_column))
     {
       tmp=format;
-      format=g_strconcat(format, " %s", 0L);
+      format=g_strconcat(format, " %s", NULL);
       g_free(tmp);
     }
     else
     {
       tmp=format;
-      format=g_strconcat(format, " %*s", 0L);
+      format=g_strconcat(format, " %*s", NULL);
       g_free(tmp);
     }
   }
--- ygraph-0.16~cvs20090218.orig/src/read_data.c
+++ ygraph-0.16~cvs20090218/src/read_data.c
@@ -166,11 +166,10 @@
 void
 dataset_set_label(DataSet* data_set, gchar* label)
 {
-  gchar* s;
   gint v;
   v = find_equal(label, strlen(label));
   if (v>-1)
-    data_set->name = g_strdup(g_strstrip(s));
+    data_set->name = g_strdup(g_strstrip(label + v));
   else
     data_set->name = NULL;
 }
--- ygraph-0.16~cvs20090218.orig/src/ygraph.c
+++ ygraph-0.16~cvs20090218/src/ygraph.c
@@ -316,7 +316,7 @@
      NULL
     },
     {"frame_integrate",
-     (char)NULL,
+     (char)0,
      POPT_ARG_NONE,
      &option_f_int,
      0,
@@ -324,7 +324,7 @@
      NULL
     },
     {"time_integrate",
-     (char)NULL,
+     (char)0,
      POPT_ARG_NONE,
      &option_t_int,
      0,
@@ -332,7 +332,7 @@
      NULL
     },
     {"font_size_factor",
-     (char)NULL,
+     (char)0,
      POPT_ARG_STRING,
      &option_font_size_factor,
      0,
--- ygraph-0.16~cvs20090218.orig/src/ygraph.h
+++ ygraph-0.16~cvs20090218/src/ygraph.h
@@ -36,6 +36,7 @@
 #endif
 
 #ifndef __GTK_H__
+#  define GTK_ENABLE_BROKEN 1
 #  include <gtk/gtk.h>
 #endif
 
@@ -699,6 +700,7 @@
 gint dataset_read_from_file (gchar* fname, gint skip);
 void time_list_merge(DataSet* data_set);
 void time_list_build(void);
+int check_for_nan(gchar* str);
 
 /* scape_panel.c */
 void scale_panel_create(Plot* plot, gint action, GtkItem* range_set_button);
@@ -732,6 +734,8 @@
 void string_to_columns(gchar* range_string);
 gdouble* string_to_range(gchar* range_string);
 gchar* get_font(const char* font, gint font_size);
+void set_global_column_format_string();
+gint find_equal(gchar* s, gint len);
 
 #endif /* __YGRAPH_H__ */