r15005 - gnucash/branches/swig-redo - Fix build by adding a few guile header includes. Again replace two

[Andreas Köhler]

Author: andi5
Date: 2006-10-10 21:25:59 -0400 (Tue, 10 Oct 2006)
New Revision: 15005
Trac: http://svn.gnucash.org/trac/changeset/15005

Modified:
   gnucash/branches/swig-redo/
   gnucash/branches/swig-redo/src/gnome-utils/gnc-main-window.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-model-commodity.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-model-price.c
   gnucash/branches/swig-redo/src/gnome/dialog-price-edit-db.c
   gnucash/branches/swig-redo/src/gnome/dialog-sx-from-trans.c
   gnucash/branches/swig-redo/src/gnome/dialog-tax-info.c
   gnucash/branches/swig-redo/src/gnome/gnc-plugin-page-register.c
   gnucash/branches/swig-redo/src/register/ledger-core/gnc-ledger-display.c
Log:
Fix build by adding a few guile header includes. Again replace two
g_malloc's of r15003 by g_new0.



Property changes on: gnucash/branches/swig-redo
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:774
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12971
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:776
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12971

Modified: gnucash/branches/swig-redo/src/gnome/dialog-price-edit-db.c
===================================================================
--- gnucash/branches/swig-redo/src/gnome/dialog-price-edit-db.c	2006-10-11 00:57:52 UTC (rev 15004)
+++ gnucash/branches/swig-redo/src/gnome/dialog-price-edit-db.c	2006-10-11 01:25:59 UTC (rev 15005)
@@ -27,6 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libguile.h>
+#include <guile-mappings.h>
 #include <time.h>
 
 #include "dialog-utils.h"

Modified: gnucash/branches/swig-redo/src/gnome/dialog-sx-from-trans.c
===================================================================
--- gnucash/branches/swig-redo/src/gnome/dialog-sx-from-trans.c	2006-10-11 00:57:52 UTC (rev 15004)
+++ gnucash/branches/swig-redo/src/gnome/dialog-sx-from-trans.c	2006-10-11 01:25:59 UTC (rev 15005)
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "glib-compat.h"

Modified: gnucash/branches/swig-redo/src/gnome/dialog-tax-info.c
===================================================================
--- gnucash/branches/swig-redo/src/gnome/dialog-tax-info.c	2006-10-11 00:57:52 UTC (rev 15004)
+++ gnucash/branches/swig-redo/src/gnome/dialog-tax-info.c	2006-10-11 01:25:59 UTC (rev 15005)
@@ -26,6 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libguile.h>
+#include <guile-mappings.h>
 
 #include "Account.h"
 #include "gnc-ui-util.h"

Modified: gnucash/branches/swig-redo/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/branches/swig-redo/src/gnome/gnc-plugin-page-register.c	2006-10-11 00:57:52 UTC (rev 15004)
+++ gnucash/branches/swig-redo/src/gnome/gnc-plugin-page-register.c	2006-10-11 01:25:59 UTC (rev 15005)
@@ -34,6 +34,8 @@
 
 #include "config.h"
 
+#include <libguile.h>
+#include <guile-mappings.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #ifndef HAVE_GLIB26

Modified: gnucash/branches/swig-redo/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/branches/swig-redo/src/gnome-utils/gnc-main-window.c	2006-10-11 00:57:52 UTC (rev 15004)
+++ gnucash/branches/swig-redo/src/gnome-utils/gnc-main-window.c	2006-10-11 01:25:59 UTC (rev 15005)
@@ -38,7 +38,7 @@
 #include <gnome.h>
 #include <glib/gi18n.h>
 #include <libguile.h>
-#include "guile-mappings.h"
+#include <guile-mappings.h>
 #ifndef HAVE_GLIB26
 #include "gkeyfile.h"
 #endif

Modified: gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-model-commodity.c
===================================================================
--- gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-model-commodity.c	2006-10-11 00:57:52 UTC (rev 15004)
+++ gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-model-commodity.c	2006-10-11 01:25:59 UTC (rev 15005)
@@ -1256,7 +1256,7 @@
 	    return;
 	  }
 
-	  data = g_malloc(sizeof(*data));
+	  data = g_new0 (remove_data, 1);
 	  data->model = model;
 	  data->path = path;
 	  pending_removals = g_slist_append (pending_removals, data);

Modified: gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-model-price.c
===================================================================
--- gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-model-price.c	2006-10-11 00:57:52 UTC (rev 15004)
+++ gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-model-price.c	2006-10-11 01:25:59 UTC (rev 15005)
@@ -1515,7 +1515,7 @@
 	    return;
 	  }
 
-	  data = g_malloc(sizeof(*data));
+	  data = g_new0 (remove_data, 1);
 	  data->model = model;
 	  data->path = path;
 	  pending_removals = g_slist_append (pending_removals, data);

Modified: gnucash/branches/swig-redo/src/register/ledger-core/gnc-ledger-display.c
===================================================================
--- gnucash/branches/swig-redo/src/register/ledger-core/gnc-ledger-display.c	2006-10-11 00:57:52 UTC (rev 15004)
+++ gnucash/branches/swig-redo/src/register/ledger-core/gnc-ledger-display.c	2006-10-11 01:25:59 UTC (rev 15005)
@@ -196,7 +196,7 @@
 gnc_get_default_register_style (GNCAccountType type)
 {
   SplitRegisterStyle new_style = REG_STYLE_LEDGER;
-  char *style_string;
+  gchar *style_string;
 
   switch (type) {
 #if 0
@@ -215,9 +215,9 @@
       new_style = REG_STYLE_AUTO_LEDGER;
     else
       new_style = REG_STYLE_LEDGER;
-    
+
     if (style_string != NULL)
-      free(style_string);
+      g_free(style_string);
 
     break;
   }