[Gnucash-changes] Vitaly Lipatov's C-construct patch.

Derek Atkins warlord at cvs.gnucash.org
Mon May 24 11:29:07 EDT 2004


Log Message:
-----------
Vitaly Lipatov's C-construct patch.

	* src/gnome/dialog-new-user.c:
	* src/gnome/gnc-embedded-window.c:
	* src/gnome/gnc-main-window.c:
	* src/gnome/gnc-plugin-page-account-tree.c:
	* src/gnome-utils/dialog-transfer.c:
	* src/gnome-utils/gnc-query-list.c:
	  Vitaly Lipatov's C-construct patch -- 
	  During compiling CVS version of gnucash (tag gnucash-gnome2-dev)
	  I have found some mistakes makes error with GCC compiler.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        ChangeLog
    gnucash/src/gnome:
        dialog-new-user.c
        gnc-embedded-window.c
        gnc-main-window.c
        gnc-plugin-page-account-tree.c
    gnucash/src/gnome-utils:
        dialog-transfer.c
        gnc-query-list.c

Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.126
retrieving revision 1.1487.2.127
diff -LChangeLog -LChangeLog -u -r1.1487.2.126 -r1.1487.2.127
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,15 @@
+2004-05-24  Derek Atkins  <derek at ihtfp.com>
+
+	* src/gnome/dialog-new-user.c:
+	* src/gnome/gnc-embedded-window.c:
+	* src/gnome/gnc-main-window.c:
+	* src/gnome/gnc-plugin-page-account-tree.c:
+	* src/gnome-utils/dialog-transfer.c:
+	* src/gnome-utils/gnc-query-list.c:
+	  Vitaly Lipatov's C-construct patch -- 
+	  During compiling CVS version of gnucash (tag gnucash-gnome2-dev)
+	  I have found some mistakes makes error with GCC compiler.
+
 2004-05-15  Joshua Sled  <jsled at asynchronous.org>
 
 	* src/report/report-gnome/gnc-plugin-page-report.c
Index: gnc-embedded-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-embedded-window.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -Lsrc/gnome/gnc-embedded-window.c -Lsrc/gnome/gnc-embedded-window.c -u -r1.1.2.5 -r1.1.2.6
--- src/gnome/gnc-embedded-window.c
+++ src/gnome/gnc-embedded-window.c
@@ -166,8 +166,9 @@
 static void
 gnc_embedded_window_class_init (GncEmbeddedWindowClass *klass)
 {
+  GObjectClass *object_class;
   ENTER("klass %p", klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  object_class = G_OBJECT_CLASS (klass);
 
   parent_class = g_type_class_peek_parent (klass);
 
Index: dialog-new-user.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-new-user.c,v
retrieving revision 1.4.4.7
retrieving revision 1.4.4.8
diff -Lsrc/gnome/dialog-new-user.c -Lsrc/gnome/dialog-new-user.c -u -r1.4.4.7 -r1.4.4.8
--- src/gnome/dialog-new-user.c
+++ src/gnome/dialog-new-user.c
@@ -114,13 +114,14 @@
   GtkWidget *dialog;
   GladeXML  *xml;
   gint result;
+  gboolean keepshowing;
 
   xml = gnc_glade_xml_new ("newuser.glade", "New User Cancel Dialog");
 
   dialog = glade_xml_get_widget (xml, "New User Cancel Dialog");
 
   result = gtk_dialog_run (GTK_DIALOG (dialog));
-  gboolean keepshowing = (result == GTK_RESPONSE_YES);
+  keepshowing = (result == GTK_RESPONSE_YES);
 
   gnc_set_first_startup (keepshowing);
   gncp_new_user_finish ();
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.30
retrieving revision 1.1.2.31
diff -Lsrc/gnome/gnc-plugin-page-account-tree.c -Lsrc/gnome/gnc-plugin-page-account-tree.c -u -r1.1.2.30 -r1.1.2.31
--- src/gnome/gnc-plugin-page-account-tree.c
+++ src/gnome/gnc-plugin-page-account-tree.c
@@ -799,8 +799,6 @@
 {
 	Account *account = gnc_plugin_page_account_tree_get_current_account (page);
 
-	g_return_if_fail (account != NULL);
-
 	const char *no_splits_no_children = _("Are you sure you want to delete the %s account?");
 	const char *no_splits = _("Are you sure you want to delete the %s\n"
 				  "account and all its children?");
Index: gnc-main-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-main-window.c,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -Lsrc/gnome/gnc-main-window.c -Lsrc/gnome/gnc-main-window.c -u -r1.1.2.31 -r1.1.2.32
--- src/gnome/gnc-main-window.c
+++ src/gnome/gnc-main-window.c
@@ -1199,9 +1199,9 @@
 {
         GtkWindow *w = GTK_WINDOW(gtk_window_new( GTK_WINDOW_TOPLEVEL ));
         gnc_html *gnchtml = gnc_html_new( w );
+        gchar *html = "<html><head><title>testing</title></head><body><h1>testing</h1><h2>testing 2</h2> <p>Testing</p></body></html>";
         gtk_container_add( GTK_CONTAINER(w), GTK_WIDGET(gnc_html_get_widget(gnchtml)) );
 
-        gchar *html = "<html><head><title>testing</title></head><body><h1>testing</h1><h2>testing 2</h2> <p>Testing</p></body></html>";
         gnc_html_show_data( gnchtml, html, strlen( html ) );
         
         gtk_widget_show_all( GTK_WIDGET(w) );
Index: gnc-query-list.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-query-list.c,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -Lsrc/gnome-utils/gnc-query-list.c -Lsrc/gnome-utils/gnc-query-list.c -u -r1.8.2.4 -r1.8.2.5
--- src/gnome-utils/gnc-query-list.c
+++ src/gnome-utils/gnc-query-list.c
@@ -780,6 +780,7 @@
   {
     GList *node;
     gint row;
+    const QofParam *gup;
     QofParam *qp= NULL;
 
     for (i = 0, node = list->column_params; node; node = node->next)
@@ -832,7 +833,7 @@
     update_booleans (list, row);
 
     /* and set a watcher on this item */
-    const QofParam *gup = list->priv->get_guid;
+    gup = list->priv->get_guid;
     guid = (const GUID*)((gup->param_getfcn)(item->data, gup));
     gnc_gui_component_watch_entity (list->priv->component_id, guid,
 				    GNC_EVENT_MODIFY | GNC_EVENT_DESTROY);
Index: dialog-transfer.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/dialog-transfer.c,v
retrieving revision 1.9.4.19
retrieving revision 1.9.4.20
diff -Lsrc/gnome-utils/dialog-transfer.c -Lsrc/gnome-utils/dialog-transfer.c -u -r1.9.4.19 -r1.9.4.20
--- src/gnome-utils/dialog-transfer.c
+++ src/gnome-utils/dialog-transfer.c
@@ -570,8 +570,9 @@
   if( gnc_numeric_zero_p(
            gnc_amount_edit_get_amount(GNC_AMOUNT_EDIT(xferData->amount_edit))))
   {
+    gnc_numeric amt;
     DEBUG("updating amount");
-    gnc_numeric amt = xaccSplitGetValue( split );
+    amt = xaccSplitGetValue( split );
 
     /* If we've matched a previous transfer, it will appear
      * to be negative in the from account.


More information about the gnucash-changes mailing list