[Gnucash-changes] Heath Martin's x86_64 patch.

[Derek Atkins]

Log Message:
-----------
Heath Martin's x86_64 patch.

	* lib/egg/egg-menu-merge.c:
	  change a gint to a gsize
	* src/gnome/gnc-plugin-page-account-tree.c:
	  use GINT_TO_POINTER() instead of a direct cast.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        ChangeLog
    gnucash/lib/egg:
        egg-menu-merge.c
    gnucash/src/gnome:
        gnc-plugin-page-account-tree.c

Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.137
retrieving revision 1.1487.2.138
diff -LChangeLog -LChangeLog -u -r1.1487.2.137 -r1.1487.2.138
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,11 @@
+2004-10-31  Derek Atkins  <derek at ihtfp.com>
+
+	Heath Martin's x86_64 patch:
+	* lib/egg/egg-menu-merge.c:
+	  change a gint to a gsize
+	* src/gnome/gnc-plugin-page-account-tree.c:
+	  use GINT_TO_POINTER() instead of a direct cast.
+
 2004-08-05  Derek Atkins  <derek at ihtfp.com>
 
 	* src/engine/gnc-budget*:
Index: egg-menu-merge.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/egg/Attic/egg-menu-merge.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -Llib/egg/egg-menu-merge.c -Llib/egg/egg-menu-merge.c -u -r1.1.2.9 -r1.1.2.10
--- lib/egg/egg-menu-merge.c
+++ lib/egg/egg-menu-merge.c
@@ -753,7 +753,7 @@
 				 GError **error)
 {
   gchar *buffer;
-  gint length;
+  gsize length;
   guint res;
 
   if (!g_file_get_contents (filename, &buffer, &length, error))
Index: gnc-plugin-page-account-tree.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-page-account-tree.c,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -Lsrc/gnome/gnc-plugin-page-account-tree.c -Lsrc/gnome/gnc-plugin-page-account-tree.c -u -r1.1.2.31 -r1.1.2.32
--- src/gnome/gnc-plugin-page-account-tree.c
+++ src/gnome/gnc-plugin-page-account-tree.c
@@ -791,7 +791,7 @@
 		}
 	}
 
-	return (gpointer) (helper_res->has_splits || helper_res->has_ro_splits);
+	return GINT_TO_POINTER (helper_res->has_splits || helper_res->has_ro_splits);
 }
 
 static void