[Gnucash-changes] 2005-08-22 Josh Sled <jsled@asynchronous.org> * lib/goffice/:

Joshua Sled jsled at cvs.gnucash.org
Mon Aug 22 20:21:12 EDT 2005


Log Message:
-----------
2005-08-22  Josh Sled <jsled at asynchronous.org>
	* lib/goffice/: Conditionallize #warnings used as TODO tracking
	from "goffice" import.  Fix compiler warnings.  lib/goffice/
	should now build with -Werror.  As such, remove -Werror removal
	from .mk files.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        ChangeLog
    gnucash/lib/goffice:
        goffice-plugins.mk
        goffice.c
        goffice.mk
        split.c
    gnucash/lib/goffice/graph:
        gog-error-bar.c
        gog-graph.c
        gog-legend.c
        gog-renderer-gnome-print.c
        gog-style.c
        gog-theme.c
    gnucash/lib/goffice/graph/plugins/plot_xy:
        gog-bubble-prefs.c
        gog-xy.c
    gnucash/lib/goffice/gui-utils:
        go-action-combo-color.c
        go-color-palette.c
        go-combo-box.c
        go-combo-color.c
        go-combo-pixmaps.c
    gnucash/lib/goffice/split:
        gui-util.c
        mathfunc.c
        plugin-loader-module.c
        plugin-service.c
        validation.c
        value.c
    gnucash/lib/goffice/utils:
        go-file.c

Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.269
retrieving revision 1.1487.2.270
diff -LChangeLog -LChangeLog -u -r1.1487.2.269 -r1.1487.2.270
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2005-08-22  Josh Sled <jsled at asynchronous.org>
+	* lib/goffice/: Conditionallize #warnings used as TODO tracking
+	from "goffice" import.  Fix compiler warnings.  lib/goffice/
+	should now build with -Werror.  As such, remove -Werror removal
+	from .mk files.
+	
 2005-08-22  Neil Williams <linux at codehelp.co.uk>
 
 	* configure.in: Provisional building of libgoffice.
Index: gog-style.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/graph/Attic/gog-style.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/graph/gog-style.c -Llib/goffice/graph/gog-style.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/graph/gog-style.c
+++ lib/goffice/graph/gog-style.c
@@ -626,7 +626,9 @@
 		g_warning ("Sorry -- cannot handle URIs here right now.");
 		return;
 	}
+#ifdef GOG_WARN_TODO
 #warning "Handle URIs here."
+#endif
 
 	gog_style_set_fill_image_filename (style, filename);
 
@@ -841,6 +843,7 @@
 
 /************************************************************************/
 
+#if 0 //unused
 static void
 cb_font_changed (FontSelector *fs, G_GNUC_UNUSED gpointer mstyle,
 		 StylePrefState *state)
@@ -853,12 +856,13 @@
 	gog_style_set_font (style, new_font);
 	set_style (state);
 }
+#endif // 0 -- unused
 
 static void
 font_init (StylePrefState *state, guint32 enable, gpointer optional_notebook)
 {
 	GogStyle *style = state->style;
-	GtkWidget *w, *box;
+	GtkWidget *box;
 
 	if (!enable)
 		return;
@@ -1714,7 +1718,9 @@
 gboolean
 gog_style_is_marker_visible (GogStyle const *style)
 {
+#ifdef GOG_WARN_TODO
 #warning TODO : make this smarter
+#endif
 	return (style->interesting_fields & GOG_STYLE_MARKER) &&
 		go_marker_get_shape (style->marker.mark) != GO_MARKER_NONE;
 }
@@ -1722,7 +1728,9 @@
 gboolean
 gog_style_is_outline_visible (GogStyle const *style)
 {
+#ifdef GOG_WARN_TODO
 #warning TODO : make this smarter
+#endif
 	return UINT_RGBA_A (style->outline.color) > 0 && 
 		style->outline.dash_type != GO_LINE_NONE;
 }
@@ -1730,7 +1738,10 @@
 gboolean
 gog_style_is_line_visible (GogStyle const *style)
 {
+#ifdef GOG_WARN_TODO
 #warning TODO : make this smarter
+#endif
+
 	return UINT_RGBA_A (style->line.color) > 0 && 
 		style->line.dash_type != GO_LINE_NONE;
 }
Index: gog-theme.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/graph/Attic/gog-theme.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/graph/gog-theme.c -Llib/goffice/graph/gog-theme.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/graph/gog-theme.c
+++ lib/goffice/graph/gog-theme.c
@@ -148,7 +148,10 @@
 	g_return_val_if_fail (theme != NULL, NULL);
 
 	if (theme->load_from_file != NULL) {
+#ifdef GOG_WARN_TODO
 #warning TODO parse some xml
+#endif
+
 	}
 
 	/* 1) have we seen this specific role before */
@@ -236,7 +239,10 @@
 	else
 		gog_style_apply_theme (style, elem->style);
 
+#ifdef GOG_WARN_TODO
 #warning we should handle the applicability here not in the map
+#endif
+
 	if (ind >= 0 && elem->map)
 		(elem->map) (style, ind);
 }
Index: gog-renderer-gnome-print.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/graph/Attic/gog-renderer-gnome-print.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/graph/gog-renderer-gnome-print.c -Llib/goffice/graph/gog-renderer-gnome-print.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/graph/gog-renderer-gnome-print.c
+++ lib/goffice/graph/gog-renderer-gnome-print.c
@@ -490,8 +490,10 @@
 		}
 		if (y <= 0)
 			y = 0;
-		
+	
+#ifdef GOG_WARN_TODO	
 #warning "add clipping"
+#endif
 
 #ifdef HAVE_GNOME_PRINT_PANGO_CREATE_LAYOUT
 		gnome_print_moveto (prend->gp_context,x, -y);
Index: gog-legend.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/graph/Attic/gog-legend.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/graph/gog-legend.c -Llib/goffice/graph/gog-legend.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/graph/gog-legend.c
+++ lib/goffice/graph/gog-legend.c
@@ -263,7 +263,9 @@
 	GogLegend *l = GOG_LEGEND (v->model);
 	unsigned n, mult = 1;
 
+#ifdef GOG_WARN_TODO
 #warning TODO : make this smarter (multiple columns and shrinking text)
+#endif
 	dat.view = v;
 	dat.maximum.w = 0.;
 	dat.maximum.h = gog_renderer_pt2r_y (v->renderer, l->swatch_size_pts);
Index: gog-graph.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/graph/Attic/gog-graph.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/graph/gog-graph.c -Llib/goffice/graph/gog-graph.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/graph/gog-graph.c
+++ lib/goffice/graph/gog-graph.c
@@ -334,7 +334,9 @@
 {
 	g_return_if_fail (GOG_GRAPH (graph) != NULL);
 	g_return_if_fail (GOG_THEME (theme) != NULL);
+#ifdef GOG_WARN_TODO
 #warning TODO
+#endif
 }
 
 /**
Index: gog-error-bar.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/graph/Attic/gog-error-bar.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/graph/gog-error-bar.c -Llib/goffice/graph/gog-error-bar.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/graph/gog-error-bar.c
+++ lib/goffice/graph/gog-error-bar.c
@@ -471,7 +471,9 @@
 	}
 	if (str != NULL)
 		gsf_xml_out_add_cstr_unchecked (output, "display", str);
+#ifdef GOG_WARN_TODO
 #warning Why 5.0 and why 1.0 ?
+#endif
 	if (bar->width != 5.)
 		gsf_xml_out_add_float (output, "width", bar->width, 2);
 	if (bar->style->line.width != 1.)
Index: gog-bubble-prefs.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/graph/plugins/plot_xy/Attic/gog-bubble-prefs.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/graph/plugins/plot_xy/gog-bubble-prefs.c -Llib/goffice/graph/plugins/plot_xy/gog-bubble-prefs.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/graph/plugins/plot_xy/gog-bubble-prefs.c
+++ lib/goffice/graph/plugins/plot_xy/gog-bubble-prefs.c
@@ -106,7 +106,9 @@
 	g_signal_connect (G_OBJECT (w),
 		"toggled",
 		G_CALLBACK (cb_3d_changed), bubble);
+#ifdef GOG_WARN_TODO
 #warning "Hide 3d button while not supported"
+#endif
 	gtk_widget_hide (w);
 
 	w = glade_xml_get_widget (gui, "scale");
Index: gog-xy.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/graph/plugins/plot_xy/Attic/gog-xy.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/graph/plugins/plot_xy/gog-xy.c -Llib/goffice/graph/plugins/plot_xy/gog-xy.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/graph/plugins/plot_xy/gog-xy.c
+++ lib/goffice/graph/plugins/plot_xy/gog-xy.c
@@ -551,7 +551,9 @@
 	path[0].x = path[MAX_ARC_SEGMENTS].x = x + radius;
 	path[0].y = path[MAX_ARC_SEGMENTS].y = y;
 	path[0].code = ART_MOVETO;
+#ifdef GOG_WARN_TODO
 #warning what about small bubbles. With a very small radius, libart emits lot of warnings.
+#endif
 	if (radius < 1.) radius = 1.;
 	for (i = 1, theta = dt; i < MAX_ARC_SEGMENTS; i++, theta += dt) {
 		path[i].x = x + radius * cos (theta);
Index: plugin-service.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/split/Attic/plugin-service.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/split/plugin-service.c -Llib/goffice/split/plugin-service.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/split/plugin-service.c
+++ lib/goffice/split/plugin-service.c
@@ -32,6 +32,7 @@
 
 static GHashTable *services = NULL;
 
+#if 0
 static FileFormatLevel
 parse_format_level_str (gchar const *format_level_str, FileFormatLevel def)
 {
@@ -73,6 +74,7 @@
 
 	return hash;
 }
+#endif // 0 -- unused, jsled
 
 
 static void
Index: plugin-loader-module.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/split/Attic/plugin-loader-module.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/split/plugin-loader-module.c -Llib/goffice/split/plugin-loader-module.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/split/plugin-loader-module.c
+++ lib/goffice/split/plugin-loader-module.c
@@ -46,9 +46,11 @@
 static void gnm_plugin_loader_module_unload_base (GnmPluginLoader *loader, ErrorInfo **ret_error);
 
 static void gnm_plugin_loader_module_load_service_general (GnmPluginLoader *loader, GnmPluginService *service, ErrorInfo **ret_error);
+#if 0
 static void gnm_plugin_loader_module_load_service_file_opener (GnmPluginLoader *loader, GnmPluginService *service, ErrorInfo **ret_error);
 static void gnm_plugin_loader_module_load_service_file_saver (GnmPluginLoader *loader, GnmPluginService *service, ErrorInfo **ret_error);
 static void gnm_plugin_loader_module_load_service_function_group (GnmPluginLoader *loader, GnmPluginService *service, ErrorInfo **ret_error);
+#endif // 0 -- unused, jsled
 static void gnm_plugin_loader_module_load_service_plugin_loader (GnmPluginLoader *loader, GnmPluginService *service, ErrorInfo **ret_error);
 static void gnm_plugin_loader_module_load_service_ui (GnmPluginLoader *loader, GnmPluginService *service, ErrorInfo **ret_error);
 
Index: mathfunc.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/split/Attic/mathfunc.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/split/mathfunc.c -Llib/goffice/split/mathfunc.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/split/mathfunc.c
+++ lib/goffice/split/mathfunc.c
@@ -1759,7 +1759,7 @@
 
 /* NaNs propagated correctly */
 
-
+#if 0
 static int chebyshev_init(gnm_float *dos, int nos, gnm_float eta)
 {
     int i, ii;
@@ -1779,6 +1779,7 @@
     }
     return i;
 }
+#endif // 0 -- jsled, unused
 
 
 static gnm_float chebyshev_eval(gnm_float x, const gnm_float *a, const int n)
Index: value.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/split/Attic/value.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/split/value.c -Llib/goffice/split/value.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/split/value.c
+++ lib/goffice/split/value.c
@@ -1371,6 +1371,7 @@
 
 /****************************************************************************/
 
+#if 0
 static gboolean
 criteria_test_equal (GnmValue const *x, GnmValue const *y)
 {
@@ -1443,6 +1444,7 @@
 	else
 	        return FALSE;
 }
+#endif // 0 - unused, jsled
 
 #if 0
 --jsled
Index: validation.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/split/Attic/validation.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/split/validation.c -Llib/goffice/split/validation.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/split/validation.c
+++ lib/goffice/split/validation.c
@@ -201,7 +201,9 @@
 		}
 
 		case VALIDATION_TYPE_IN_LIST :
+#ifdef GOG_WARN_TODO
 #warning TODO
+#endif
 			return VALIDATION_STATUS_VALID;
 
 		case VALIDATION_TYPE_TEXT_LENGTH :
Index: gui-util.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/split/Attic/gui-util.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/split/gui-util.c -Llib/goffice/split/gui-util.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/split/gui-util.c
+++ lib/goffice/split/gui-util.c
@@ -101,6 +101,7 @@
 	return;
 }
 
+#if 0
 static void
 fsel_response_cb (GtkFileChooser *dialog,
 		  gint response_id,
@@ -126,6 +127,7 @@
 	gtk_dialog_response (dialog, GTK_RESPONSE_CANCEL);
 	return TRUE; /* Do not destroy */
 }
+#endif // 0 - unused, jsled
 
 #if 0
 gboolean
@@ -358,6 +360,7 @@
 	gboolean freed;
 } KeyedDialogContext;
 
+#if 0
 static void
 cb_free_keyed_dialog_context (KeyedDialogContext *ctxt)
 {
@@ -384,6 +387,7 @@
 	}
 	return FALSE;
 }
+#endif // 0 - unused, jsled
 
 #if 0
 /**
Index: goffice-plugins.mk
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/Attic/goffice-plugins.mk,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -Llib/goffice/goffice-plugins.mk -Llib/goffice/goffice-plugins.mk -u -r1.1.4.2 -r1.1.4.3
--- lib/goffice/goffice-plugins.mk
+++ lib/goffice/goffice-plugins.mk
@@ -8,8 +8,3 @@
 GOFFICE_PLUGIN_FLAGS = $(GNUCASH_PLUGIN_LDFLAGS)
 
 AM_CFLAGS = ${GLIB_CFLAGS} ${XML_CFLAGS} ${GSF_CFLAGS} ${ART_CFLAGS} ${GNOME_CFLAGS} ${GDK_PIXBUF_CLFAGS} ${GLADE_CFLAGS}
-
-# This will produce automake complaints, but it allows everything
-# outside of goffice to be copiled with -Werror.  Its worth the one
-# complaint.
-CFLAGS += -Wno-error
Index: goffice.mk
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/Attic/goffice.mk,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -Llib/goffice/goffice.mk -Llib/goffice/goffice.mk -u -r1.1.4.2 -r1.1.4.3
--- lib/goffice/goffice.mk
+++ lib/goffice/goffice.mk
@@ -6,8 +6,3 @@
 
 GOFFICE_PLUGIN_FLAGS = 
 # GOFFICE_PLUGIN_FLAGS = $(GNUCASH_PLUGIN_LDFLAGS)
-
-# This will produce automake complaints, but it allows everything
-# outside of goffice to be copiled with -Werror.  Its worth the one
-# complaint.
-CFLAGS += -Wno-error
Index: split.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/Attic/split.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/split.c -Llib/goffice/split.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/split.c
+++ lib/goffice/split.c
@@ -72,6 +72,7 @@
 	return NULL;
 }
 
+#if 0
 char const *
 range_name(GnmRange const *src)
 {
@@ -83,6 +84,7 @@
 {
   return "unimplemented";
 }
+#endif // 0
 
 double
 gnm_app_display_dpi_get (gboolean horizontal)
Index: goffice.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/Attic/goffice.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/goffice.c -Llib/goffice/goffice.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/goffice.c
+++ lib/goffice/goffice.c
@@ -73,9 +73,9 @@
 	gog_themes_init	();
 	// -libgoffice_init
 
-	gnm_string_init();
-	mstyle_init();
-	gnm_conf_init( FALSE );
+	//gnm_string_init();
+	//mstyle_init();
+	//gnm_conf_init( FALSE );
 
 	ctx = cmd_context_stderr_new();
 	plugins_init( ctx );
Index: go-combo-color.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/gui-utils/Attic/go-combo-color.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/gui-utils/go-combo-color.c -Llib/goffice/gui-utils/go-combo-color.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/gui-utils/go-combo-color.c
+++ lib/goffice/gui-utils/go-combo-color.c
@@ -260,7 +260,9 @@
 void
 go_combo_color_set_color_gdk (GOComboColor *cc, GdkColor *color)
 {
+#ifdef GOG_WARN_TODO
 #warning convert to GOColor
+#endif
 	g_return_if_fail (IS_GO_COMBO_COLOR (cc));
 
 	if (color != NULL)
Index: go-combo-box.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/gui-utils/Attic/go-combo-box.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/gui-utils/go-combo-box.c -Llib/goffice/gui-utils/go-combo-box.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/gui-utils/go-combo-box.c
+++ lib/goffice/gui-utils/go-combo-box.c
@@ -759,7 +759,9 @@
 go_combo_box_set_tooltip (GOComboBox *c, GtkTooltips *tips,
 			   char const *text, char const *priv_text)
 {
+#ifdef GOG_WARN_TODO
 #warning this is ugly the tip moves as we jump from preview to arrow
+#endif
 	gtk_tooltips_set_tip (tips, c->priv->display_widget, text, priv_text);
 	gtk_tooltips_set_tip (tips, c->priv->arrow_button, text, priv_text);
 }
Index: go-combo-pixmaps.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/gui-utils/Attic/go-combo-pixmaps.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/gui-utils/go-combo-pixmaps.c -Llib/goffice/gui-utils/go-combo-pixmaps.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/gui-utils/go-combo-pixmaps.c
+++ lib/goffice/gui-utils/go-combo-pixmaps.c
@@ -185,7 +185,9 @@
 static gboolean
 cb_swatch_release_event (GtkWidget *button, GdkEventButton *event, GOComboPixmaps *combo)
 {
+#ifdef GOG_WARN_TODO
 #warning TODO do I want to check for which button ?
+#endif
 	return swatch_activated (combo, button);
 }
 static gboolean
Index: go-color-palette.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/gui-utils/Attic/go-color-palette.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/gui-utils/go-color-palette.c -Llib/goffice/gui-utils/go-color-palette.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/gui-utils/go-color-palette.c
+++ lib/goffice/gui-utils/go-color-palette.c
@@ -325,7 +325,9 @@
 static gboolean
 cb_swatch_release_event (GtkBin *button, GdkEventButton *event, GOColorPalette *pal)
 {
+#ifdef GOG_WARN_TODO
 #warning TODO do I want to check for which button ?
+#endif
 	swatch_activated (pal, button);
 	return TRUE;
 }
Index: go-action-combo-color.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/gui-utils/Attic/go-action-combo-color.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/gui-utils/go-action-combo-color.c -Llib/goffice/gui-utils/go-action-combo-color.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/gui-utils/go-action-combo-color.c
+++ lib/goffice/gui-utils/go-action-combo-color.c
@@ -243,7 +243,9 @@
 void
 go_action_combo_color_set_group (GOActionComboColor *action, gpointer group_key)
 {
+#ifdef GOG_WARN_TODO
 #warning TODO
+#endif
 }
 
 GOColor
Index: go-file.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/utils/Attic/go-file.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/utils/go-file.c -Llib/goffice/utils/go-file.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/utils/go-file.c
+++ lib/goffice/utils/go-file.c
@@ -169,7 +169,7 @@
 char *
 go_dirname_from_uri (const char *uri, gboolean brief)
 {
-	char *dirname_utf8, *dirname;
+	char *dirname_utf8 = NULL, *dirname = NULL;
 
 #ifdef WITH_GNOME
 	char *raw_uri = gnome_vfs_unescape_string (uri, G_DIR_SEPARATOR_S);


More information about the gnucash-changes mailing list