Re: error compiling 1.3.2

[mortenw gnome org (Morten Welinder)]

This should make 1.3.2 happier for you.  All were extracted from cvs HEAD.

Morten



Index: src/commands.c
===================================================================
RCS file: /cvs/gnome/gnumeric/src/commands.c,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- src/commands.c      28 Aug 2004 07:19:55 -0000      1.394
+++ src/commands.c      30 Aug 2004 21:11:03 -0000      1.395
@@ -3634,6 +3634,11 @@
 } CmdMergeCells;
 
 static void
+cmd_merge_cells_repeat (GnmCommand const *cmd, WorkbookControl *wbc);
+
+MAKE_GNM_COMMAND (CmdMergeCells, cmd_merge_cells, cmd_merge_cells_repeat);
+
+static void
 cmd_merge_cells_repeat (GnmCommand const *cmd, WorkbookControl *wbc)
 {
        SheetView *sv = wb_control_cur_sheet_view (wbc);
@@ -3642,7 +3647,6 @@
                CMD_MERGE_CELLS (cmd)->center);
        range_fragment_free (range_list);
 }
-MAKE_GNM_COMMAND (CmdMergeCells, cmd_merge_cells, cmd_merge_cells_repeat);
 
 static gboolean
 cmd_merge_cells_undo (GnmCommand *cmd, WorkbookControl *wbc)
Index: src/gui-file.c
===================================================================
RCS file: /cvs/gnome/gnumeric/src/gui-file.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- src/gui-file.c      27 Aug 2004 16:39:43 -0000      1.100
+++ src/gui-file.c      30 Aug 2004 21:11:03 -0000      1.101
@@ -114,8 +114,6 @@
        }
 
        sheet_update (wb_view_cur_sheet (wbv));
-
-       return new_wbcg ? new_wbcg : wbcg;
 }
 
 gboolean
Index: src/cut-n-paste-code/goffice/graph/gog-plot-engine.c
===================================================================
RCS file: /cvs/gnome/gnumeric/src/cut-n-paste-code/goffice/graph/gog-plot-engine.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/cut-n-paste-code/goffice/graph/gog-plot-engine.c        26 Aug 2004 18:41:31 -0000      1.11
+++ src/cut-n-paste-code/goffice/graph/gog-plot-engine.c        30 Aug 2004 21:14:16 -0000      1.12
@@ -102,6 +102,7 @@
                 */
                plugin = plugin_service_get_plugin (service);
                refd_plugins = g_slist_prepend (refd_plugins, plugin);
+               g_object_ref (plugin);
                gnm_plugin_use_ref (plugin);
        }
 
@@ -352,6 +353,7 @@
 gog_plugin_services_shutdown (void)
 {
        g_slist_foreach (refd_plugins, (GFunc)gnm_plugin_use_unref, NULL);
+       g_slist_foreach (refd_plugins, (GFunc)g_object_unref, NULL);
        g_slist_free (refd_plugins);
 }