r16430 - gnucash/branches/register-rewrite/src - Fixup some incorrectly merged changes.

[Chris Shoemaker]

Author: chris
Date: 2007-08-13 23:10:51 -0400 (Mon, 13 Aug 2007)
New Revision: 16430
Trac: http://svn.gnucash.org/trac/changeset/16430

Modified:
   gnucash/branches/register-rewrite/src/engine/cap-gains.c
   gnucash/branches/register-rewrite/src/gnome/gnc-plugin-page-register.c
Log:
Fixup some incorrectly merged changes.

Modified: gnucash/branches/register-rewrite/src/engine/cap-gains.c
===================================================================
--- gnucash/branches/register-rewrite/src/engine/cap-gains.c	2007-08-13 23:09:25 UTC (rev 16429)
+++ gnucash/branches/register-rewrite/src/engine/cap-gains.c	2007-08-14 03:10:51 UTC (rev 16430)
@@ -90,7 +90,7 @@
    {
       Split *s = node->data;
       Transaction *t = s->parent;
-      if (acc->commodity != t->common_currency) return TRUE;
+      if (xaccAccountGetCommodity(acc) != t->common_currency) return TRUE;
    }
 
    return FALSE;

Modified: gnucash/branches/register-rewrite/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/branches/register-rewrite/src/gnome/gnc-plugin-page-register.c	2007-08-13 23:09:25 UTC (rev 16429)
+++ gnucash/branches/register-rewrite/src/gnome/gnc-plugin-page-register.c	2007-08-14 03:10:51 UTC (rev 16430)
@@ -1850,8 +1850,8 @@
   split    = gnc_split_register_get_current_split(reg);
   trans    = xaccSplitGetParent(split);
 
-  if(split && trans)
-    gnc_ui_print_check_dialog_create(plugin_page, split);
+  if (split && trans)
+      gnc_ui_print_check_dialog_create(GNC_PLUGIN_PAGE(plugin_page), split);
 
   LEAVE(" ");
 }