Hello community, here is the log from the commit of package goffice checked in at Thu Sep 28 01:15:37 CEST 2006. -------- --- GNOME/goffice/goffice.changes 2006-08-31 01:52:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/goffice/goffice.changes 2006-09-28 00:23:16.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 27 18:45:52 CEST 2006 - jhargadon@suse.de + +- update to version 0.2.1 +- Back port some fixes for free memory reads that were causing + problems on freebsd +- Fixed a sign in equation [#328236] + +------------------------------------------------------------------- Old: ---- goffice-0.1.2.tar.bz2 New: ---- goffice-0.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ goffice.spec ++++++ --- /var/tmp/diff_new_pack.UYQlzf/_old 2006-09-28 01:15:30.000000000 +0200 +++ /var/tmp/diff_new_pack.UYQlzf/_new 2006-09-28 01:15:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package goffice (Version 0.1.2) +# spec file for package goffice (Version 0.2.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,8 +12,8 @@ Name: goffice BuildRequires: gnutls-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgsf-devel libwnck-devel mDNSResponder-devel perl-XML-Parser update-desktop-files -Version: 0.1.2 -Release: 17 +Version: 0.2.1 +Release: 1 URL: http://www.gnumeric.org/ Group: System/GUI/GNOME License: GPL @@ -115,6 +115,11 @@ /opt/gnome/include/* %changelog -n goffice +* Wed Sep 27 2006 - jhargadon@suse.de +- update to version 0.2.1 +- Back port some fixes for free memory reads that were causing + problems on freebsd +- Fixed a sign in equation [#328236] * Thu Aug 31 2006 - ro@suse.de - make it build (undef GTK_DISABLE_DEPRECATED in go-combo-box.c) * Wed Jan 25 2006 - mls@suse.de ++++++ goffice-0.1.2.tar.bz2 -> goffice-0.2.1.tar.bz2 ++++++ ++++ 11940 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/ChangeLog new/goffice-0.2.1/ChangeLog --- old/goffice-0.1.2/ChangeLog 2005-11-14 06:21:56.000000000 +0100 +++ new/goffice-0.2.1/ChangeLog 2006-03-22 05:37:19.000000000 +0100 @@ -1,3 +1,57 @@ +2006-03-21 Jody Goldberg <jody@gnome.org> + + * Release 0.2.1 + +2006-03-20 Jody Goldberg <jody@gnome.org> + + * goffice/cut-n-paste/foocanvas/foo-canvas.c (}) : back port some + fixes for free memory reads that were causing problems on freebsd. + +2006-03-19 Jean Brefort <jean.brefort@normalesup.org> + + * plugins/reg_linear/gog-polynom-reg.c: + (gog_polynom_reg_curve_get_equation): fixed a sign in equation [#328236]. + +2006-03-01 Jean Brefort <jean.brefort@normalesup.org> + + * goffice/graph/gog-reg-curve.c: (gog_reg_curve_view_render): don't render + segments outside the bounding box [#332990]. + +2006-01-30 Jody Goldberg <jody@gnome.org> + + * configure.in : post release bump + +2006-01-30 Jody Goldberg <jody@gnome.org> + + * Release 0.2.0 + +2006-01-23 Jean Brefort <jean.brefort@normalesup.org> + + * goffice/gtk/go-action-combo-color.c: (make_icon), + (go_action_combo_color_connect_proxy): fixed warnings when using a + combo action in a menu. + * goffice/gtk/go-action-combo-pixmaps.c: (make_icon), + (go_action_combo_pixmaps_connect_proxy): ditto. + +2006-01-05 Jean Brefort <jean.brefort@normalesup.org> + + * goffice/utils/go-libxml-extras.c: + (e_xml_get_child_by_name_by_lang): fix an internaitonalization bug. + +2006-01-01 Jean Brefort <jean.brefort@normalesup.org> + + * plugins/plot_barcol/gog-minmax.c: fixed a marker display problem. + +2005-11-17 Emmanuel Pacaud <emanuel.pacaud@univ-poitiers.fr> + + * pixmap/chart_dropbar_1_[12].[svg,png]: fix rendering and bitmap. + [#321675] + +2005-11-14 Jody Goldberg <jody@gnome.org> + + * configure.in : post release bump + and disable the deprecated flags. + 2005-11-14 Jody Goldberg <jody@gnome.org> * Release 0.1.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/NEWS new/goffice-0.2.1/NEWS --- old/goffice-0.1.2/NEWS 2005-11-14 04:57:27.000000000 +0100 +++ new/goffice-0.2.1/NEWS 2006-03-20 18:26:20.000000000 +0100 @@ -1,3 +1,13 @@ +goffice 0.2.1: + +Jean Brefort: + * Fixed a sign in equation [#328236]. + +Morten: + * Back port some fixes for free memory reads that were causing + problems on freebsd. + +-------------------------------------------------------------------------- goffice 0.1.2: Morten: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/configure.in new/goffice-0.2.1/configure.in --- old/goffice-0.1.2/configure.in 2005-11-07 06:04:43.000000000 +0100 +++ new/goffice-0.2.1/configure.in 2006-01-30 08:13:06.000000000 +0100 @@ -4,8 +4,8 @@ AC_PREREQ(2.54) m4_define([goffice_version_epoch], [0]) -m4_define([goffice_version_major], [1]) -m4_define([goffice_version_minor], [2]) +m4_define([goffice_version_major], [2]) +m4_define([goffice_version_minor], [1]) m4_define([goffice_version_extra], []) m4_define([goffice_full_version], [goffice_version_epoch.goffice_version_major.goffice_version_minor[]goffice_version_extra]) @@ -201,20 +201,20 @@ AC_SUBST(GOFFICE_PLUGIN_LIBADD) dnl disable for in stable release, re-enable for development series -CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED" -CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED" -if test "x$goffice_with_gtk" = "xtrue"; then - CFLAGS="$CFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED" - CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED" - CFLAGS="$CFLAGS -DGDK_MULTIHEAD_SAFE" - CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED" - CFLAGS="$CFLAGS -DLIBGLADE_DISABLE_DEPRECATED" -fi -if test "x$goffice_with_gnome" = "xtrue"; then - CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED" - CFLAGS="$CFLAGS -DBONOBO_DISABLE_DEPRECATED" - CFLAGS="$CFLAGS -DBONOBO_UI_DISABLE_DEPRECATED" -fi +dnl CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED" +dnl CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED" +dnl if test "x$goffice_with_gtk" = "xtrue"; then +dnl CFLAGS="$CFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED" +dnl CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED" +dnl CFLAGS="$CFLAGS -DGDK_MULTIHEAD_SAFE" +dnl CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED" +dnl CFLAGS="$CFLAGS -DLIBGLADE_DISABLE_DEPRECATED" +dnl fi +dnl if test "x$goffice_with_gnome" = "xtrue"; then +dnl CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED" +dnl CFLAGS="$CFLAGS -DBONOBO_DISABLE_DEPRECATED" +dnl CFLAGS="$CFLAGS -DBONOBO_UI_DISABLE_DEPRECATED" +dnl fi dnl **************************** dnl prep the pixmap generator diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/app/module-plugin-defs.h new/goffice-0.2.1/goffice/app/module-plugin-defs.h --- old/goffice-0.1.2/goffice/app/module-plugin-defs.h 2005-03-28 18:58:14.000000000 +0200 +++ new/goffice-0.2.1/goffice/app/module-plugin-defs.h 2006-03-22 05:52:29.000000000 +0100 @@ -7,9 +7,6 @@ G_BEGIN_DECLS -void go_plugin_init (GOPlugin *p, GOCmdContext *cc); /* optional, called after dlopen */ -void go_plugin_shutdown (GOPlugin *p, GOCmdContext *cc); /* optional, called before close */ - typedef struct { char const * const key; /* object being versioned */ char const * const version; /* version id (strict equality is required) */ @@ -34,6 +31,12 @@ G_MODULE_EXPORT GOPluginModuleHeader const go_plugin_header = \ { GOFFICE_MODULE_PLUGIN_MAGIC_NUMBER, G_N_ELEMENTS (go_plugin_depends) } +/* the folowwing two functions ar declared here, but are not + * implemented in libgoffice. Each plugin must implement one + * instance of both. */ +void go_plugin_init (GOPlugin *plugin, GOCmdContext *cc); +void go_plugin_shutdown (GOPlugin *plugin, GOCmdContext *cc); + G_END_DECLS #endif /* GOFFICE_MODULE_PLUGIN_DEFS_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/cut-n-paste/foocanvas/foo-canvas-widget.c new/goffice-0.2.1/goffice/cut-n-paste/foocanvas/foo-canvas-widget.c --- old/goffice-0.1.2/goffice/cut-n-paste/foocanvas/foo-canvas-widget.c 2005-08-08 18:14:42.000000000 +0200 +++ new/goffice-0.2.1/goffice/cut-n-paste/foocanvas/foo-canvas-widget.c 2006-03-20 18:23:28.000000000 +0100 @@ -197,7 +197,7 @@ witem = FOO_CANVAS_WIDGET (object); if (witem->widget && !witem->in_destroy) { - gtk_signal_disconnect (GTK_OBJECT (witem->widget), witem->destroy_id); + g_signal_handler_disconnect (G_OBJECT (witem->widget), witem->destroy_id); gtk_widget_destroy (witem->widget); witem->widget = NULL; } @@ -319,17 +319,15 @@ switch (param_id) { case PROP_WIDGET: if (witem->widget) { - gtk_signal_disconnect (GTK_OBJECT (witem->widget), witem->destroy_id); + g_signal_handler_disconnect (G_OBJECT (witem->widget), witem->destroy_id); gtk_container_remove (GTK_CONTAINER (item->canvas), witem->widget); } obj = g_value_get_object (value); if (obj) { witem->widget = GTK_WIDGET (obj); - witem->destroy_id = gtk_signal_connect (GTK_OBJECT (obj), - "destroy", - (GtkSignalFunc) do_destroy, - witem); + witem->destroy_id = g_signal_connect (G_OBJECT (obj), + "destroy", G_CALLBACK (do_destroy), witem); gtk_layout_put (GTK_LAYOUT (item->canvas), witem->widget, witem->cx + item->canvas->zoom_xofs, witem->cy + item->canvas->zoom_yofs); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/cut-n-paste/foocanvas/foo-canvas.c new/goffice-0.2.1/goffice/cut-n-paste/foocanvas/foo-canvas.c --- old/goffice-0.1.2/goffice/cut-n-paste/foocanvas/foo-canvas.c 2005-08-08 18:14:42.000000000 +0200 +++ new/goffice-0.2.1/goffice/cut-n-paste/foocanvas/foo-canvas.c 2006-03-22 05:29:05.000000000 +0100 @@ -200,10 +200,6 @@ static void item_post_create_setup (FooCanvasItem *item) { - GtkObject *obj; - - obj = GTK_OBJECT (item); - group_add (FOO_CANVAS_GROUP (item->parent), item); redraw_and_repick_if_mapped (item); @@ -299,10 +295,9 @@ } } - -/* Standard object dispose function for canvas items */ +/* Destroy handler for canvas items */ static void -foo_canvas_item_dispose (GObject *object) +foo_canvas_item_destroy (GtkObject *object) { FooCanvasItem *item; @@ -310,43 +305,48 @@ item = FOO_CANVAS_ITEM (object); - foo_canvas_item_request_redraw (item); + if (item->canvas) { + foo_canvas_item_request_redraw (item); - /* Make the canvas forget about us */ + /* Make the canvas forget about us */ - if (item == item->canvas->current_item) { - item->canvas->current_item = NULL; - item->canvas->need_repick = TRUE; - } + if (item == item->canvas->current_item) { + item->canvas->current_item = NULL; + item->canvas->need_repick = TRUE; + } - if (item == item->canvas->new_current_item) { - item->canvas->new_current_item = NULL; - item->canvas->need_repick = TRUE; - } + if (item == item->canvas->new_current_item) { + item->canvas->new_current_item = NULL; + item->canvas->need_repick = TRUE; + } - if (item == item->canvas->grabbed_item) { - GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (item->canvas)); - item->canvas->grabbed_item = NULL; - gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME); - } + if (item == item->canvas->grabbed_item) { + GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (item->canvas)); + item->canvas->grabbed_item = NULL; + gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME); + } - if (item == item->canvas->focused_item) - item->canvas->focused_item = NULL; + if (item == item->canvas->focused_item) + item->canvas->focused_item = NULL; - /* Normal destroy stuff */ + /* Normal destroy stuff */ - if (item->object.flags & FOO_CANVAS_ITEM_MAPPED) - (* FOO_CANVAS_ITEM_GET_CLASS (item)->unmap) (item); + if (item->object.flags & FOO_CANVAS_ITEM_MAPPED) + (* FOO_CANVAS_ITEM_GET_CLASS (item)->unmap) (item); - if (item->object.flags & FOO_CANVAS_ITEM_REALIZED) - (* FOO_CANVAS_ITEM_GET_CLASS (item)->unrealize) (item); + if (item->object.flags & FOO_CANVAS_ITEM_REALIZED) + (* FOO_CANVAS_ITEM_GET_CLASS (item)->unrealize) (item); - if (item->parent) - group_remove (FOO_CANVAS_GROUP (item->parent), item); + if (item->parent) + group_remove (FOO_CANVAS_GROUP (item->parent), item); - G_OBJECT_CLASS (item_parent_class)->dispose (object); + item->canvas = NULL; + } + + GTK_OBJECT_CLASS (item_parent_class)->destroy (object); } + /* Realize handler for canvas items */ static void foo_canvas_item_realize (FooCanvasItem *item) @@ -985,19 +985,20 @@ /* Everything is ok, now actually reparent the item */ - g_object_ref (GTK_OBJECT (item)); /* protect it from the unref in group_remove */ + g_object_ref (G_OBJECT (item)); /* protect it from the unref in group_remove */ foo_canvas_item_request_redraw (item); group_remove (FOO_CANVAS_GROUP (item->parent), item); item->parent = FOO_CANVAS_ITEM (new_group); + /* item->canvas is unchanged. */ group_add (new_group, item); /* Redraw and repick */ redraw_and_repick_if_mapped (item); - g_object_unref (GTK_OBJECT (item)); + g_object_unref (G_OBJECT (item)); } /** @@ -1643,8 +1644,12 @@ static void group_add (FooCanvasGroup *group, FooCanvasItem *item) { - g_object_ref (GTK_OBJECT (item)); +#if GLIB_CHECK_VERSION(2,9,1) + g_object_ref_sink (item); +#else + g_object_ref (item); gtk_object_sink (GTK_OBJECT (item)); +#endif if (!group->item_list) { group->item_list = g_list_append (group->item_list, item); @@ -1682,7 +1687,8 @@ /* Unparent the child */ item->parent = NULL; - g_object_unref (GTK_OBJECT (item)); + item->canvas = NULL; + g_object_unref (G_OBJECT (item)); /* Remove it from the list */ @@ -2092,12 +2098,15 @@ canvas->root = FOO_CANVAS_ITEM (g_object_new (foo_canvas_group_get_type (), NULL)); canvas->root->canvas = canvas; - g_object_ref (GTK_OBJECT (canvas->root)); +#if GLIB_CHECK_VERSION(2,9,1) + g_object_ref_sink (canvas->root); +#else + g_object_ref (canvas->root); gtk_object_sink (GTK_OBJECT (canvas->root)); +#endif - canvas->root_destroy_id = g_signal_connect (GTK_OBJECT (canvas->root), "destroy", - (GtkSignalFunc) panic_root_destroyed, - canvas); + canvas->root_destroy_id = g_signal_connect (G_OBJECT (canvas->root), + "destroy", G_CALLBACK (panic_root_destroyed), canvas); canvas->need_repick = TRUE; canvas->doing_update = FALSE; @@ -2149,12 +2158,14 @@ canvas = FOO_CANVAS (object); if (canvas->root_destroy_id) { - g_signal_handler_disconnect (GTK_OBJECT (canvas->root), canvas->root_destroy_id); + g_signal_handler_disconnect (G_OBJECT (canvas->root), canvas->root_destroy_id); canvas->root_destroy_id = 0; } if (canvas->root) { - g_object_unref (GTK_OBJECT (canvas->root)); + FooCanvasItem *root = canvas->root; canvas->root = NULL; + gtk_object_destroy (GTK_OBJECT (root)); + g_object_unref (root); } shutdown_transients (canvas); @@ -2366,9 +2377,9 @@ /* Signal GtkLayout that it should do a redraw. */ if (redraw) { if (changed_x) - g_signal_emit_by_name (GTK_OBJECT (canvas->layout.hadjustment), "value_changed"); + g_signal_emit_by_name (G_OBJECT (canvas->layout.hadjustment), "value_changed"); if (changed_y) - g_signal_emit_by_name (GTK_OBJECT (canvas->layout.vadjustment), "value_changed"); + g_signal_emit_by_name (G_OBJECT (canvas->layout.vadjustment), "value_changed"); } } @@ -2398,8 +2409,8 @@ canvas->layout.hadjustment->value, canvas->layout.vadjustment->value, TRUE); - g_signal_emit_by_name (GTK_OBJECT (canvas->layout.hadjustment), "changed"); - g_signal_emit_by_name (GTK_OBJECT (canvas->layout.vadjustment), "changed"); + g_signal_emit_by_name (G_OBJECT (canvas->layout.hadjustment), "changed"); + g_signal_emit_by_name (G_OBJECT (canvas->layout.vadjustment), "changed"); } /* Emits an event for an item in the canvas, be it the current item, grabbed @@ -2525,14 +2536,14 @@ finished = FALSE; while (item && !finished) { - g_object_ref (GTK_OBJECT (item)); + g_object_ref (G_OBJECT (item)); g_signal_emit ( - GTK_OBJECT (item), item_signals[ITEM_EVENT], 0, + G_OBJECT (item), item_signals[ITEM_EVENT], 0, &ev, &finished); parent = item->parent; - g_object_unref (GTK_OBJECT (item)); + g_object_unref (G_OBJECT (item)); item = parent; } @@ -3950,8 +3961,10 @@ foo_canvas_item_class_init (FooCanvasItemClass *class) { GObjectClass *gobject_class; + GtkObjectClass *object_class; gobject_class = (GObjectClass *) class; + object_class = (GtkObjectClass *) class; item_parent_class = gtk_type_class (gtk_object_get_type ()); @@ -3980,7 +3993,7 @@ G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); - gobject_class->dispose = foo_canvas_item_dispose; + object_class->destroy = foo_canvas_item_destroy; class->realize = foo_canvas_item_realize; class->unrealize = foo_canvas_item_unrealize; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/data/go-data-simple.c new/goffice-0.2.1/goffice/data/go-data-simple.c --- old/goffice-0.1.2/goffice/data/go-data-simple.c 2005-11-04 19:43:40.000000000 +0100 +++ new/goffice-0.2.1/goffice/data/go-data-simple.c 2006-03-22 05:53:39.000000000 +0100 @@ -733,7 +733,7 @@ /** * go_data_vector_str_set_translate_func: - * @vec: a #GODataVectorStr + * @vector: a #GODataVectorStr * @func: a #GOTranslateFunc * @data: data to be passed to @func and @notify * @notify: a #GODestroyNotify function to be called when @vec is @@ -766,7 +766,7 @@ /** * go_data_vector_str_set_translation_domain: - * @action_group: a #GtkActionGroup + * @vector: a #GODataVectorStr * @domain: the translation domain to use for dgettext() calls * * Sets the translation domain and uses dgettext() for translating the diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/data/go-data-simple.h new/goffice-0.2.1/goffice/data/go-data-simple.h --- old/goffice-0.1.2/goffice/data/go-data-simple.h 2005-08-08 18:14:42.000000000 +0200 +++ new/goffice-0.2.1/goffice/data/go-data-simple.h 2006-03-22 05:53:39.000000000 +0100 @@ -63,7 +63,7 @@ GOTranslateFunc func, gpointer data, GDestroyNotify notify); -void go_data_vector_str_set_translation_domain (GODataVectorStr *vec, +void go_data_vector_str_set_translation_domain (GODataVectorStr *vector, char const *domain); #define GO_DATA_MATRIX_VAL_TYPE (go_data_matrix_val_get_type ()) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/data/go-data.h new/goffice-0.2.1/goffice/data/go-data.h --- old/goffice-0.1.2/goffice/data/go-data.h 2005-08-08 18:14:42.000000000 +0200 +++ new/goffice-0.2.1/goffice/data/go-data.h 2006-03-22 05:53:39.000000000 +0100 @@ -32,7 +32,6 @@ #define IS_GO_DATA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DATA_TYPE)) GType go_data_get_type (void); -gboolean go_data_needs_recalc (GOData const *dat); GOData *go_data_dup (GOData const *src); gboolean go_data_eq (GOData const *a, GOData const *b); GOFormat *go_data_preferred_fmt (GOData const *dat); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/goffice-features.h new/goffice-0.2.1/goffice/goffice-features.h --- old/goffice-0.1.2/goffice/goffice-features.h 2005-11-07 16:08:24.000000000 +0100 +++ new/goffice-0.2.1/goffice/goffice-features.h 2006-03-22 05:30:51.000000000 +0100 @@ -35,16 +35,16 @@ #define GOFFICE_SUPPLIED_STRTOLD 1 /* The version number of this release, possibly with additional suffix */ -#define GOFFICE_VERSION "0.1.2" +#define GOFFICE_VERSION "0.2.1" /* The Epoch of this release */ #define GO_VERSION_EPOCH 0 /* The Major version number of this release */ -#define GO_VERSION_MAJOR 1 +#define GO_VERSION_MAJOR 2 /* The Minor version number of this release */ -#define GO_VERSION_MINOR 2 +#define GO_VERSION_MINOR 1 /* Extra, possibly empty tag for this release */ #define GO_VERSION_EXTRA "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/goffice-paths.h new/goffice-0.2.1/goffice/goffice-paths.h --- old/goffice-0.1.2/goffice/goffice-paths.h 2005-11-07 16:08:27.000000000 +0100 +++ new/goffice-0.2.1/goffice/goffice-paths.h 2006-03-22 05:30:53.000000000 +0100 @@ -3,8 +3,8 @@ #ifndef GOFFICE_PATHS_H #define GOFFICE_PATHS_H -#define GOFFICE_DATADIR "/local/gnome/head/test/share/goffice/0.1.2" -#define GOFFICE_LIBDIR "/local/gnome/head/test/lib/goffice/0.1.2" +#define GOFFICE_DATADIR "/local/gnome/head/test/share/goffice/0.2.1" +#define GOFFICE_LIBDIR "/local/gnome/head/test/lib/goffice/0.2.1" #define GOFFICE_ICONDIR "/local/gnome/head/test/share/pixmaps/goffice" #define GOFFICE_LOCALEDIR "/local/gnome/head/test/share/locale" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-data-allocator.c new/goffice-0.2.1/goffice/graph/gog-data-allocator.c --- old/goffice-0.1.2/goffice/graph/gog-data-allocator.c 2005-08-08 18:14:43.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-data-allocator.c 2006-03-22 05:55:51.000000000 +0100 @@ -44,6 +44,13 @@ return gog_data_allocator_type; } +/** + * gog_data_allocator_allocate: + * @dalloc: a #GogDataAllocator + * @plot: a #GogPlot + * + **/ + void gog_data_allocator_allocate (GogDataAllocator *dalloc, GogPlot *plot) { @@ -51,6 +58,16 @@ GOG_DATA_ALLOCATOR_GET_CLASS (dalloc)->allocate (dalloc, plot); } +/** + * gog_data_allocator_editor: + * @dalloc: a #GogDataAllocator + * @set: + * @dim_i: + * @data_type: + * + * returns: a #GtkWidget. + **/ + gpointer gog_data_allocator_editor (GogDataAllocator *dalloc, GogDataset *set, int dim_i, GogDataType data_type) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-data-allocator.h new/goffice-0.2.1/goffice/graph/gog-data-allocator.h --- old/goffice-0.1.2/goffice/graph/gog-data-allocator.h 2005-08-08 18:14:43.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-data-allocator.h 2006-03-22 05:55:51.000000000 +0100 @@ -44,7 +44,7 @@ GType gog_data_allocator_get_type (void); -void gog_data_allocator_allocate (GogDataAllocator *a, GogPlot *plot); +void gog_data_allocator_allocate (GogDataAllocator *dalloc, GogPlot *plot); gpointer gog_data_allocator_editor (GogDataAllocator *dalloc, GogDataset *set, int dim_i, GogDataType data_type); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-data-set.c new/goffice-0.2.1/goffice/graph/gog-data-set.c --- old/goffice-0.1.2/goffice/graph/gog-data-set.c 2005-09-30 16:56:24.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-data-set.c 2006-03-22 05:56:09.000000000 +0100 @@ -52,7 +52,7 @@ * @first : inclusive * @last : _inclusive_ * - * Returns the first and last valid indicises to get/set dim. + * FIXME: Returns the first and last valid indicises to get/set dim. **/ void gog_dataset_dims (GogDataset const *set, int *first, int *last) @@ -82,7 +82,7 @@ /** * gog_dataset_set_dim : - * @series : #GogSeries + * @set: #GogDataset * @dim_i : < 0 gets the name * @val : #GOData * @err : #GError @@ -94,7 +94,7 @@ { GogDatasetClass *klass; - g_return_if_fail (val == NULL || GO_DATA (val) != NULL); + g_return_if_fail (val == NULL || IS_GO_DATA (val)); if (set == NULL || !IS_GOG_DATASET (set)) { g_warning ("gog_dataset_set_dim called with invalid GogDataset"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-data-set.h new/goffice-0.2.1/goffice/graph/gog-data-set.h --- old/goffice-0.1.2/goffice/graph/gog-data-set.h 2005-08-08 18:14:43.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-data-set.h 2006-03-22 05:56:09.000000000 +0100 @@ -34,6 +34,7 @@ int dim_i; gulong handler; } GogDatasetElement; + typedef struct { GTypeInterface base; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-error-bar.c new/goffice-0.2.1/goffice/graph/gog-error-bar.c --- old/goffice-0.1.2/goffice/graph/gog-error-bar.c 2005-11-06 16:15:09.000000000 +0100 +++ new/goffice-0.2.1/goffice/graph/gog-error-bar.c 2006-03-22 05:56:28.000000000 +0100 @@ -492,7 +492,7 @@ With a 0 value, it might be, because of rounding errors */ *min = *max = -1.; - g_return_val_if_fail (GOG_ERROR_BAR (bar) != NULL, FALSE); + g_return_val_if_fail (IS_GOG_ERROR_BAR (bar), FALSE); if (!gog_series_is_valid (bar->series)) return FALSE; value = go_data_vector_get_value (GO_DATA_VECTOR (bar->series->values[bar->dim_i].data), index); @@ -546,7 +546,7 @@ int i, imax; double tmp_min, tmp_max, plus, minus; - g_return_if_fail (GOG_ERROR_BAR (bar) != NULL); + g_return_if_fail (IS_GOG_ERROR_BAR (bar)); if (!gog_series_is_valid (bar->series)) { *min = DBL_MAX; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-grid-line.c new/goffice-0.2.1/goffice/graph/gog-grid-line.c --- old/goffice-0.1.2/goffice/graph/gog-grid-line.c 2005-10-05 18:33:59.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-grid-line.c 2006-03-22 06:17:34.000000000 +0100 @@ -61,7 +61,7 @@ gboolean gog_grid_line_is_minor (GogGridLine *ggl) { - g_return_val_if_fail (GOG_GRID_LINE (ggl) != NULL, FALSE); + g_return_val_if_fail (IS_GOG_GRID_LINE (ggl), FALSE); return ggl->is_minor; } @@ -322,14 +322,6 @@ gog_renderer_pop_style (view->renderer); } -static gboolean -gog_grid_line_info_at_point (GogView *view, double x, double y, - GogObject const *cur_selection, - GogObject **obj, char **name) -{ - return FALSE; -} - static void gog_grid_line_view_class_init (GogGridLineViewClass *gview_klass) { @@ -337,7 +329,6 @@ gview_parent_klass = g_type_class_peek_parent (gview_klass); view_klass->render = gog_grid_line_view_render; - view_klass->info_at_point = gog_grid_line_info_at_point; } static GSF_CLASS (GogGridLineView, gog_grid_line_view, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-label.c new/goffice-0.2.1/goffice/graph/gog-label.c --- old/goffice-0.1.2/goffice/graph/gog-label.c 2005-10-11 16:52:02.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-label.c 2006-03-22 06:01:31.000000000 +0100 @@ -156,7 +156,7 @@ { GogTextClass *klass; - g_return_val_if_fail (GOG_TEXT (text) != NULL, NULL); + g_return_val_if_fail (IS_GOG_TEXT (text), NULL); klass = GOG_TEXT_GET_CLASS (text); @@ -212,7 +212,7 @@ { GogLabel *label = GOG_LABEL (text); - g_return_val_if_fail (GOG_LABEL (label) != NULL, NULL); + g_return_val_if_fail (IS_GOG_LABEL (label), NULL); if (label->text.data != NULL) return g_strdup (go_data_scalar_get_str (GO_DATA_SCALAR (label->text.data))); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-object-xml.c new/goffice-0.2.1/goffice/graph/gog-object-xml.c --- old/goffice-0.1.2/goffice/graph/gog-object-xml.c 2005-11-06 16:15:09.000000000 +0100 +++ new/goffice-0.2.1/goffice/graph/gog-object-xml.c 2006-03-22 06:02:20.000000000 +0100 @@ -270,6 +270,8 @@ GParamSpec **props; GSList *ptr; + g_return_if_fail (IS_GOG_OBJECT (obj)); + gsf_xml_out_start_element (output, "GogObject"); /* Primary details */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-outlined-object.c new/goffice-0.2.1/goffice/graph/gog-outlined-object.c --- old/goffice-0.1.2/goffice/graph/gog-outlined-object.c 2005-10-05 18:33:59.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-outlined-object.c 2006-03-22 06:02:20.000000000 +0100 @@ -94,7 +94,7 @@ double gog_outlined_object_get_pad (GogOutlinedObject const *goo) { - g_return_val_if_fail (GOG_OUTLINED_OBJECT (goo) != NULL, 0.); + g_return_val_if_fail (IS_GOG_OUTLINED_OBJECT (goo), 0.); return goo->padding_pts; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-reg-curve.c new/goffice-0.2.1/goffice/graph/gog-reg-curve.c --- old/goffice-0.1.2/goffice/graph/gog-reg-curve.c 2005-10-05 18:33:59.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-reg-curve.c 2006-03-20 05:30:58.000000000 +0100 @@ -300,16 +300,16 @@ GogSeries *series = GOG_SERIES ((GOG_OBJECT (rc))->parent); GogPlot *plot = series->plot; GogAxisMap *x_map, *y_map; - double buf, *x, *y; + double buf, *x, *y, ymax; GogStyle *style; ArtBpath *path; - int i; + int i, invalids; GSList *ptr; x_map = gog_axis_map_new (plot->axis[0], view->residual.x , view->residual.w); - y_map = gog_axis_map_new (plot->axis[1], - view->residual.y + view->residual.h, + ymax = view->residual.y + view->residual.h; + y_map = gog_axis_map_new (plot->axis[1], ymax, -view->residual.h); if (!(gog_axis_map_is_valid (x_map) && @@ -331,9 +331,19 @@ for (i = 1; i <= rc->ninterp; i++) x[i] = x[0] + i * buf; - for (i = 0; i <= rc->ninterp + 1; i++) + invalids = 0; + for (i = 0; i <= rc->ninterp + 1; i++) { y[i] = gog_axis_map_to_view (y_map, gog_reg_curve_get_value_at (rc, gog_axis_map_from_view (x_map, x[i]))); + if (y[i] < view->residual.y || y[i] > ymax) { + invalids++; + /* if two or more points are outisde the interval, + we keep only the first and last ones */ + if (invalids > 2) + y[i - 1] = go_nan; + } else + invalids = 0; + } path = go_line_build_bpath (x, y, rc->ninterp + 2); style = GOG_STYLED_OBJECT (rc)->style; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-renderer-gnome-print.c new/goffice-0.2.1/goffice/graph/gog-renderer-gnome-print.c --- old/goffice-0.1.2/goffice/graph/gog-renderer-gnome-print.c 2005-08-22 18:12:51.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-renderer-gnome-print.c 2006-03-22 06:14:14.000000000 +0100 @@ -540,7 +540,7 @@ gnome_print_gsave (prend->gp_context); - half_size = gog_renderer_line_size (renderer, marker->size) / 2.0; + half_size = gog_renderer_line_size (renderer, go_marker_get_size (marker)) / 2.0; art_affine_scale (scaling, half_size, half_size); art_affine_translate (translation, x, y); art_affine_multiply (affine, scaling, translation); @@ -549,12 +549,12 @@ fill_path = art_vpath_affine_transform (fill_path_raw, affine); gnome_print_setlinecap (prend->gp_context, ART_PATH_STROKE_CAP_ROUND); - set_color (prend, marker->fill_color); + set_color (prend, go_marker_get_fill_color (marker)); draw_path (prend, fill_path); gnome_print_closepath (prend->gp_context); gnome_print_fill (prend->gp_context); - set_color (prend, marker->outline_color); + set_color (prend, go_marker_get_outline_color (marker)); gnome_print_setlinewidth (prend->gp_context, gog_renderer_line_size (renderer, go_marker_get_outline_width (marker))); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-style.c new/goffice-0.2.1/goffice/graph/gog-style.c --- old/goffice-0.1.2/goffice/graph/gog-style.c 2005-11-07 04:10:39.000000000 +0100 +++ new/goffice-0.2.1/goffice/graph/gog-style.c 2006-03-22 06:15:27.000000000 +0100 @@ -59,13 +59,14 @@ static GObjectClass *parent_klass; -/** +/* * I would have liked to do this differently and have a tighter binding between theme element and style * eg gog_style_new (theme_element) * However that will not work easily in the context of xls import where we do * not know what the type is destined for until later. This structure melds * smoothly with both approaches at the expense of a bit of power. - **/ + */ + /*************************************************************************/ typedef struct { @@ -1063,15 +1064,18 @@ /** * gog_style_dup : - * @src : #GogStyle + * @style : a source #GogStyle + * + * Duplicates @style. * + * return value: a new #GogStyle **/ GogStyle * gog_style_dup (GogStyle const *src) { GogStyle *dst; - g_return_val_if_fail (GOG_STYLE (src) != NULL, NULL); + g_return_val_if_fail (IS_GOG_STYLE (src), NULL); dst = gog_style_new (); gog_style_assign (dst, src); @@ -1084,8 +1088,8 @@ if (src == dst) return; - g_return_if_fail (GOG_STYLE (src) != NULL); - g_return_if_fail (GOG_STYLE (dst) != NULL); + g_return_if_fail (IS_GOG_STYLE (src)); + g_return_if_fail (IS_GOG_STYLE (dst)); if (GOG_FILL_STYLE_IMAGE == src->fill.type && src->fill.image.image != NULL) @@ -1134,8 +1138,8 @@ if (src == dst) return; - g_return_if_fail (GOG_STYLE (src) != NULL); - g_return_if_fail (GOG_STYLE (dst) != NULL); + g_return_if_fail (IS_GOG_STYLE (src)); + g_return_if_fail (IS_GOG_STYLE (dst)); if (dst->outline.auto_dash) dst->outline.dash_type = src->outline.dash_type; @@ -1843,8 +1847,8 @@ void gog_style_set_marker (GogStyle *style, GOMarker *marker) { - g_return_if_fail (GOG_STYLE (style) != NULL); - g_return_if_fail (GO_MARKER (marker) != NULL); + g_return_if_fail (IS_GOG_STYLE (style)); + g_return_if_fail (IS_GO_MARKER (marker)); if (style->marker.mark != marker) { if (style->marker.mark != NULL) @@ -1853,12 +1857,28 @@ } } +/** + * gog_style_get_marker : + * @style : #GogStyle + * + * Accessor for @style::marker, without referencing it. + * + * return value: the style #GOMarker. + **/ +GOMarker const * +gog_style_get_marker (GogStyle *style) +{ + g_return_val_if_fail (IS_GOG_STYLE (style), NULL); + + return style->marker.mark; +} + void gog_style_set_font_desc (GogStyle *style, PangoFontDescription *desc) { GOFont const *font; - g_return_if_fail (GOG_STYLE (style) != NULL); + g_return_if_fail (IS_GOG_STYLE (style)); font = go_font_new_by_desc (desc); if (font != NULL) { @@ -1870,7 +1890,7 @@ void gog_style_set_font (GogStyle *style, GOFont const *font) { - g_return_if_fail (GOG_STYLE (style) != NULL); + g_return_if_fail (IS_GOG_STYLE (style)); if (font != NULL) { go_font_unref (style->font.font); @@ -1881,7 +1901,7 @@ void gog_style_set_fill_brightness (GogStyle *style, float brightness) { - g_return_if_fail (GOG_STYLE (style) != NULL); + g_return_if_fail (IS_GOG_STYLE (style)); g_return_if_fail (style->fill.type == GOG_FILL_STYLE_GRADIENT); style->fill.gradient.brightness = brightness; @@ -1900,7 +1920,7 @@ void gog_style_set_fill_image_filename (GogStyle *style, char *filename) { - g_return_if_fail (GOG_STYLE (style) != NULL); + g_return_if_fail (IS_GOG_STYLE (style)); if (style->fill.type == GOG_FILL_STYLE_IMAGE) { if (style->fill.image.image != NULL) @@ -1926,7 +1946,7 @@ void gog_style_set_text_angle (GogStyle *style, double angle) { - g_return_if_fail (GOG_STYLE (style) != NULL); + g_return_if_fail (IS_GOG_STYLE (style)); style->text_layout.angle = CLAMP (angle, -180.0, 180.0); style->text_layout.auto_angle = FALSE; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-style.h new/goffice-0.2.1/goffice/graph/gog-style.h --- old/goffice-0.1.2/goffice/graph/gog-style.h 2005-08-08 18:14:43.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-style.h 2006-03-22 06:16:09.000000000 +0100 @@ -122,7 +122,9 @@ void gog_style_assign (GogStyle *dst, GogStyle const *src); void gog_style_apply_theme (GogStyle *dst, GogStyle const *src); +GOMarker const *gog_style_get_marker (GogStyle *style); void gog_style_set_marker (GogStyle *style, GOMarker *marker); + void gog_style_set_font_desc (GogStyle *style, PangoFontDescription *desc); void gog_style_set_font (GogStyle *style, GOFont const *font); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-styled-object.c new/goffice-0.2.1/goffice/graph/gog-styled-object.c --- old/goffice-0.1.2/goffice/graph/gog-styled-object.c 2005-10-05 18:34:00.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-styled-object.c 2006-03-22 06:16:44.000000000 +0100 @@ -37,16 +37,12 @@ STYLE_CHANGED, LAST_SIGNAL }; + +void gog_styled_object_style_changed (GogStyledObject *obj); + static gulong gog_styled_object_signals [LAST_SIGNAL] = { 0, }; static GObjectClass *parent_klass; -void -gog_styled_object_style_changed (GogStyledObject *obj) -{ - g_signal_emit (G_OBJECT (obj), - gog_styled_object_signals [STYLE_CHANGED], 0, obj->style); -} - static void gog_styled_object_set_property (GObject *obj, guint param_id, GValue const *value, GParamSpec *pspec) @@ -176,13 +172,24 @@ gog_styled_object_class_init, gog_styled_object_init, GOG_OBJECT_TYPE) +/** + * gog_styled_object_set_style: + * @gso: a #GogStyledObject + * @style: a #GogStyle + * + * Sets a new style for @gso, and emits "style-changed" signal. This function + * does not take ownership of @style. + * + * return value: %TRUE if new style may lead to change of object size, which + * happens when changing font size for example. + **/ gboolean gog_styled_object_set_style (GogStyledObject *gso, GogStyle *style) { gboolean resize; - g_return_val_if_fail (GOG_STYLED_OBJECT (gso) != NULL, FALSE); + g_return_val_if_fail (IS_GOG_STYLED_OBJECT (gso), FALSE); if (gso->style == style) return FALSE; @@ -201,23 +208,27 @@ /** * gog_styled_object_get_style : - * @gso : #GogStyledObject + * @gso: a #GogStyledObject + * + * Simply an accessor function that returns @gso->style, without referencing it. * - * Returns a pointer to @gso's style but does not reference it. + * return value: the styled object's #GogStyle **/ GogStyle * gog_styled_object_get_style (GogStyledObject *gso) { - g_return_val_if_fail (GOG_STYLED_OBJECT (gso) != NULL, NULL); + g_return_val_if_fail (IS_GOG_STYLED_OBJECT (gso), NULL); return gso->style; } /** * gog_styled_object_get_auto_style : - * @gso : #GogStyledObject + * @gso: a #GogStyledObject * - * Returns a new style that is initialized with the auto values for @gso. + * This function returns a new style that is initialized with the auto values for @gso. * Caller is responsible for the result. + * + * return value: a new #GogStyle **/ GogStyle * gog_styled_object_get_auto_style (GogStyledObject *gso) @@ -228,6 +239,15 @@ return res; } +/** + * gog_styled_object_apply_theme: + * @gso: a #GogStyledObject + * @style: a #GogStyle that will be themed + * + * Apply theme of @gso's parent graph to @style, i.e. properties with + * auto flag set to %TRUE are changed to default theme value. + * + **/ void gog_styled_object_apply_theme (GogStyledObject *gso, GogStyle *style) { @@ -237,3 +257,17 @@ (klass->init_style) (gso, style); } } + +/** + * gog_styled_object_style_changed: + * @gso: a #GogStyledObject + * + * Emits the "style-changed" signal. + * + **/ +void +gog_styled_object_style_changed (GogStyledObject *gso) +{ + g_signal_emit (G_OBJECT (gso), + gog_styled_object_signals [STYLE_CHANGED], 0, gso->style); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/graph/gog-theme.c new/goffice-0.2.1/goffice/graph/gog-theme.c --- old/goffice-0.1.2/goffice/graph/gog-theme.c 2005-10-05 18:34:00.000000000 +0200 +++ new/goffice-0.2.1/goffice/graph/gog-theme.c 2006-03-22 06:16:59.000000000 +0100 @@ -139,7 +139,7 @@ gog_theme_find_element (GogTheme *theme, GogObject *obj) { GogThemeElement *elem = NULL; - GObjectClass *klass; + GObjectClass *klass = NULL; /* make gcc happy */ char const *name; if (theme == NULL) @@ -244,7 +244,7 @@ void gog_theme_register (GogTheme *theme, gboolean is_default) { - g_return_if_fail (GOG_THEME (theme) != NULL); + g_return_if_fail (IS_GOG_THEME (theme)); if (is_default) { g_object_ref (theme); @@ -329,7 +329,7 @@ char const * gog_theme_get_name (GogTheme const *theme) { - g_return_val_if_fail (GOG_THEME (theme) != NULL, ""); + g_return_val_if_fail (IS_GOG_THEME (theme), ""); return theme->name; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/gtk/go-action-combo-color.c new/goffice-0.2.1/goffice/gtk/go-action-combo-color.c --- old/goffice-0.1.2/goffice/gtk/go-action-combo-color.c 2005-10-05 18:34:00.000000000 +0200 +++ new/goffice-0.2.1/goffice/gtk/go-action-combo-color.c 2006-01-23 08:45:22.000000000 +0100 @@ -73,15 +73,20 @@ GtkSettings *settings = gtk_widget_get_settings (tool); GdkScreen *screen = gtk_widget_get_screen (tool); - if (tool->parent) - size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (tool->parent)); - else - g_object_get (settings, - "gtk-toolbar-icon-size", &size, - NULL); - gtk_icon_size_lookup_for_settings (settings, size, - &pixels, NULL); g_object_get (a, "stock-id", &stock_id, NULL); + if (stock_id == NULL) + return NULL; + if (IS_GO_TOOL_COMBO_COLOR (tool)) { + if (tool->parent) + size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (tool->parent)); + else + g_object_get (settings, + "gtk-toolbar-icon-size", &size, + NULL); + gtk_icon_size_lookup_for_settings (settings, size, + &pixels, NULL); + } else + size = GTK_ICON_SIZE_MENU; icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_for_screen (screen), stock_id, pixels, 0, NULL); @@ -123,12 +128,14 @@ if (GTK_IS_IMAGE_MENU_ITEM (proxy)) { /* set the icon */ GdkPixbuf *icon = make_icon (a, proxy); - GtkWidget *image = gtk_image_new_from_pixbuf (icon); - g_object_unref (icon); - - gtk_widget_show (image); - gtk_image_menu_item_set_image ( - GTK_IMAGE_MENU_ITEM (proxy), image); + if (icon) { + GtkWidget *image = gtk_image_new_from_pixbuf (icon); + g_object_unref (icon); + + gtk_widget_show (image); + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (proxy), image); + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/gtk/go-action-combo-pixmaps.c new/goffice-0.2.1/goffice/gtk/go-action-combo-pixmaps.c --- old/goffice-0.1.2/goffice/gtk/go-action-combo-pixmaps.c 2005-10-08 04:09:53.000000000 +0200 +++ new/goffice-0.2.1/goffice/gtk/go-action-combo-pixmaps.c 2006-01-23 08:45:22.000000000 +0100 @@ -81,12 +81,17 @@ { GtkIconSize size; - if (tool->parent) - size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (tool->parent)); - else { - GtkSettings *settings = gtk_widget_get_settings (tool); - g_object_get (settings, "gtk-toolbar-icon-size", &size, NULL); - } + if (stock_id == NULL) + return NULL; + if (IS_GO_TOOL_COMBO_PIXMAPS (tool)) { + if (tool->parent) + size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (tool->parent)); + else { + GtkSettings *settings = gtk_widget_get_settings (tool); + g_object_get (settings, "gtk-toolbar-icon-size", &size, NULL); + } + } else + size = GTK_ICON_SIZE_MENU; return gtk_widget_render_icon (tool, stock_id, size, "GOActionComboPixmaps"); @@ -103,11 +108,13 @@ GOActionComboPixmaps *paction = (GOActionComboPixmaps *)a; const char *stock_id = paction->elements[0].stock_id; GdkPixbuf *icon = make_icon (a, stock_id, proxy); - GtkWidget *image = gtk_image_new_from_pixbuf (icon); - g_object_unref (icon); - gtk_widget_show (image); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), - image); + if (icon) { + GtkWidget *image = gtk_image_new_from_pixbuf (icon); + g_object_unref (icon); + gtk_widget_show (image); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), + image); + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/goffice/utils/go-libxml-extras.c new/goffice-0.2.1/goffice/utils/go-libxml-extras.c --- old/goffice-0.1.2/goffice/utils/go-libxml-extras.c 2005-08-30 15:15:49.000000000 +0200 +++ new/goffice-0.2.1/goffice/utils/go-libxml-extras.c 2006-01-05 11:39:43.000000000 +0100 @@ -279,7 +279,7 @@ if (node->name == NULL || strcmp (CXML2C (node->name), name) != 0) continue; - lang = xmlGetProp (node, CC2XML ("xml:lang")); + lang = xmlGetProp (node, CC2XML ("lang")); if (lang != NULL) { gint i; @@ -289,10 +289,10 @@ best_lang_score = i; } } + xmlFree (lang); } else if (best_node == NULL) best_node = node; - xmlFree (lang); if (best_lang_score == 0) return best_node; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/intltool-extract.in new/goffice-0.2.1/intltool-extract.in --- old/goffice-0.1.2/intltool-extract.in 2005-11-07 16:07:32.000000000 +0100 +++ new/goffice-0.2.1/intltool-extract.in 2006-03-22 05:29:59.000000000 +0100 @@ -32,7 +32,7 @@ ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; -my $VERSION = "0.34.1"; +my $VERSION = "0.34.2"; ## Loaded modules use strict; @@ -485,10 +485,12 @@ sub intltool_tree_comment { my $expat = shift; - my $data = shift; + my $data = $expat->original_string(); my $clist = $expat->{Curlist}; my $pos = $#$clist; + $data =~ s/^<!--//s; + $data =~ s/-->$//s; push @$clist, 1 => $data; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/intltool-merge.in new/goffice-0.2.1/intltool-merge.in --- old/goffice-0.1.2/intltool-merge.in 2005-11-07 16:07:32.000000000 +0100 +++ new/goffice-0.2.1/intltool-merge.in 2006-03-22 05:29:59.000000000 +0100 @@ -35,7 +35,7 @@ ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; -my $VERSION = "0.34.1"; +my $VERSION = "0.34.2"; ## Loaded modules use strict; @@ -91,7 +91,7 @@ my %po_files_by_lang = (); my %translations = (); -my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv"; +my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@"; my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); # Use this instead of \w for XML files to handle more possible characters. @@ -257,7 +257,7 @@ sub get_local_charset { my ($encoding) = @_; - my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/local/gnome/head/test/lib/charset.alias"; + my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias"; # seek character encoding aliases in charset.alias (glib) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/intltool-update.in new/goffice-0.2.1/intltool-update.in --- old/goffice-0.1.2/intltool-update.in 2005-11-07 16:07:32.000000000 +0100 +++ new/goffice-0.2.1/intltool-update.in 2006-03-22 05:29:59.000000000 +0100 @@ -30,7 +30,7 @@ ## Release information my $PROGRAM = "intltool-update"; -my $VERSION = "0.34.1"; +my $VERSION = "0.34.2"; my $PACKAGE = "intltool"; ## Loaded modules @@ -80,7 +80,8 @@ "directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec "soundlist(?:\\.in)+|". # GNOME specific "keys(?:\\.in)+|". # GNOME Mime database specific -"theme(?:\\.in)+"; # http://www.freedesktop.org/Standards/icon-theme-spec +"theme(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec +"service(?:\\.in)+"; # DBus specific my $buildin_gettext_support = "c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py"; @@ -124,7 +125,7 @@ &Console_Write_IntltoolHelp if $arg_count > 1; # --version and --help don't require a module name -my $MODULE = $GETTEXT_PACKAGE || &FindPackageName; +my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown"; if ($POT_ARG) { @@ -610,7 +611,7 @@ # sub GeneratePOTemplate { - my $XGETTEXT = $ENV{"XGETTEXT"} || "/usr/bin/xgettext"; + my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@"; my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || ''; chomp $XGETTEXT; @@ -781,7 +782,7 @@ { -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; - my $MSGMERGE = $ENV{"MSGMERGE"} || "/usr/bin/msgmerge"; + my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@"; my ($lang, $outfile) = @_; print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE; @@ -824,7 +825,7 @@ sub Console_Write_TranslationStatus { my ($lang, $output_file) = @_; - my $MSGFMT = $ENV{"MSGFMT"} || "/usr/bin/msgfmt"; + my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; $output_file = "$SRCDIR/$lang.po" if ($output_file eq ""); @@ -833,7 +834,7 @@ sub Console_Write_CoverageReport { - my $MSGFMT = $ENV{"MSGFMT"} || "/usr/bin/msgfmt"; + my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; &GatherPOFiles; @@ -873,8 +874,10 @@ { my $rest = $3; my $untouched = $1; - my $sub = $varhash{$2}; - + my $sub = ""; + # Ignore recursive definitions of variables + $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; + return SubstituteVariable ("$untouched$sub$rest"); } @@ -991,10 +994,10 @@ ($name, $version) = ($1, $2); $name =~ s/[\[\]\s]//g; $version =~ s/[\[\]\s]//g; - $varhash{"PACKAGE_NAME"} = $name; - $varhash{"PACKAGE"} = $name; - $varhash{"PACKAGE_VERSION"} = $version; - $varhash{"VERSION"} = $version; + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); + $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); + $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); } if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) @@ -1002,10 +1005,10 @@ ($name, $version) = ($1, $2); $name =~ s/[\[\]\s]//g; $version =~ s/[\[\]\s]//g; - $varhash{"PACKAGE_NAME"} = $name; - $varhash{"PACKAGE"} = $name; - $varhash{"PACKAGE_VERSION"} = $version; - $varhash{"VERSION"} = $version; + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); + $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); + $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); } # \s makes this not work, why? Binary files old/goffice-0.1.2/pixmaps/chart_dropbar_1_1.png and new/goffice-0.2.1/pixmaps/chart_dropbar_1_1.png differ Binary files old/goffice-0.1.2/pixmaps/chart_dropbar_1_2.png and new/goffice-0.2.1/pixmaps/chart_dropbar_1_2.png differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/plugins/plot_barcol/gog-minmax.c new/goffice-0.2.1/plugins/plot_barcol/gog-minmax.c --- old/goffice-0.1.2/plugins/plot_barcol/gog-minmax.c 2005-10-05 18:34:00.000000000 +0200 +++ new/goffice-0.2.1/plugins/plot_barcol/gog-minmax.c 2006-01-04 10:25:05.000000000 +0100 @@ -285,6 +285,7 @@ ArtVpath path[3], *Mpath, *mpath; GogObjectRole const *role = NULL; GogSeriesLines *lines; + GogStyle * style; if (num_elements <= 0 || num_series <= 0) return; @@ -311,6 +312,7 @@ series = ptr->data; if (!gog_series_is_valid (GOG_SERIES (series))) continue; + style = gog_styled_object_get_style (GOG_STYLED_OBJECT (series)); x = offset; min_vals = go_data_vector_get_values ( GO_DATA_VECTOR (series->base.values[1].data)); @@ -324,7 +326,7 @@ n = tmp; Mpath = g_new (ArtVpath, n + 1); mpath = g_new (ArtVpath, n + 1); - gog_renderer_push_style (view->renderer, GOG_STYLED_OBJECT (series)->style); + gog_renderer_push_style (view->renderer, style); for (i = 0; i < n; i++) { @@ -356,7 +358,7 @@ gog_series_lines_render (lines, view->renderer, bbox, Mpath, FALSE); gog_renderer_pop_style (view->renderer); } - if (model->default_style_has_markers) + if (gog_style_is_marker_visible (style)) for (i = 0; i < n; i++) { gog_renderer_draw_marker (view->renderer, mpath[i].x, mpath[i].y); gog_renderer_draw_marker (view->renderer, Mpath[i].x, Mpath[i].y); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/plugins/reg_linear/gog-polynom-reg.c new/goffice-0.2.1/plugins/reg_linear/gog-polynom-reg.c --- old/goffice-0.1.2/plugins/reg_linear/gog-polynom-reg.c 2005-10-05 18:34:00.000000000 +0200 +++ new/goffice-0.2.1/plugins/reg_linear/gog-polynom-reg.c 2006-03-20 05:31:01.000000000 +0100 @@ -101,7 +101,7 @@ GString *str = g_string_new (""); int i; if (lin->affine) { - if (curve->a[0] > 0.) + if (curve->a[1] > 0.) g_string_printf(str, "y = %g + %g x", curve->a[0], curve->a[1]); else g_string_printf(str, "y = %g - %g x", curve->a[0], -curve->a[1]); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/po/ChangeLog new/goffice-0.2.1/po/ChangeLog --- old/goffice-0.1.2/po/ChangeLog 2005-11-14 06:21:56.000000000 +0100 +++ new/goffice-0.2.1/po/ChangeLog 2006-03-22 05:37:19.000000000 +0100 @@ -1,3 +1,11 @@ +2006-03-21 Jody Goldberg <jody@gnome.org> + + * Release 0.2.1 + +2006-01-30 Jody Goldberg <jody@gnome.org> + + * Release 0.2.0 + 2005-11-14 Jody Goldberg <jody@gnome.org> * Release 0.1.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/goffice-0.1.2/po/Makefile.in.in new/goffice-0.2.1/po/Makefile.in.in --- old/goffice-0.1.2/po/Makefile.in.in 2005-11-07 16:07:32.000000000 +0100 +++ new/goffice-0.2.1/po/Makefile.in.in 2006-03-22 05:29:59.000000000 +0100 @@ -39,7 +39,9 @@ gettextsrcdir = $(datadir)/glib-2.0/gettext/po subdir = po install_sh = @install_sh@ -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +# Automake >= 1.8 provides @mkdir_p@. +# Until it can be supposed, use the safe fallback: +mkdir_p = $(install_sh) -d INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -69,6 +71,7 @@ EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS POTFILES = \ +#This Gets Replace for some reason CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -108,11 +111,7 @@ install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - if test -n "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi + $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -122,11 +121,7 @@ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ - if test -n "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ + $(mkdir_p) $$dir; \ if test -r $$cat; then \ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \ @@ -150,11 +145,7 @@ fi; \ done if test "$(PACKAGE)" = "glib"; then \ - if test -n "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ @@ -190,8 +181,8 @@ clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES - rm -f *.mo *.msg *.cat *.cat.m $(GMOFILES) + rm -f Makefile Makefile.in POTFILES stamp-it + rm -f *.mo *.msg *.cat *.cat.m *.gmo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @@ -203,11 +194,12 @@ dists="$(DISTFILES)"; \ extra_dists="$(EXTRA_DISTFILES)"; \ for file in $$extra_dists; do \ - test -f $$file && dists="$$dists $$file"; \ + test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ done; \ for file in $$dists; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ + test -f $$file || file="$(srcdir)/$$file"; \ + ln $$file $(distdir) 2> /dev/null \ + || cp -p $$file $(distdir); \ done update-po: Makefile @@ -237,23 +229,15 @@ fi; \ done -# POTFILES is created from POTFILES.in by stripping comments, empty lines -# and Intltool tags (enclosed in square brackets), and appending a full -# relative path to them -POTFILES: POTFILES.in - ( posrcprefix='$(top_srcdir)/'; \ - rm -f $@-t $@ \ - && (sed -e '/^#/d' \ - -e 's/^[[].*] *//' \ - -e '/^[ ]*$$/d' \ - -e "s@^@ $$posrcprefix@" $(srcdir)/$@.in \ - | sed -e '$$!s/$$/ \\/') > $@-t \ - && chmod a-w $@-t \ - && mv $@-t $@ ) +Makefile POTFILES: stamp-it + @if test ! -f $@; then \ + rm -f stamp-it; \ + $(MAKE) stamp-it; \ + fi -Makefile: Makefile.in.in ../config.status POTFILES +stamp-it: Makefile.in.in ../config.status POTFILES.in cd .. \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ + && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ $(SHELL) ./config.status # Tell versions [3.59,3.63) of GNU make not to export all variables. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de