r21205 - gnucash/trunk/src - Re-indentation of source code.

Christian Stimming cstim at code.gnucash.org
Mon Aug 22 03:10:57 EDT 2011


Author: cstim
Date: 2011-08-22 03:10:56 -0400 (Mon, 22 Aug 2011)
New Revision: 21205
Trac: http://svn.gnucash.org/trac/changeset/21205

Modified:
   gnucash/trunk/src/app-utils/file-utils.c
   gnucash/trunk/src/app-utils/gfec.c
   gnucash/trunk/src/app-utils/gnc-ui-util.c
   gnucash/trunk/src/app-utils/gnc-ui-util.h
   gnucash/trunk/src/app-utils/guile-util.c
   gnucash/trunk/src/app-utils/option-util.c
   gnucash/trunk/src/app-utils/test/test-scm-query-string.c
   gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
   gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c
   gnucash/trunk/src/business/business-gnome/gnc-plugin-page-owner-tree.c
   gnucash/trunk/src/engine/Account.h
   gnucash/trunk/src/engine/gncOwner.c
   gnucash/trunk/src/gnc-module/gnc-module.c
   gnucash/trunk/src/gnome-search/dialog-search.c
   gnucash/trunk/src/gnome-utils/assistant-utils.c
   gnucash/trunk/src/gnome-utils/assistant-utils.h
   gnucash/trunk/src/gnome-utils/dialog-account.c
   gnucash/trunk/src/gnome-utils/dialog-commodity.c
   gnucash/trunk/src/gnome-utils/dialog-options.c
   gnucash/trunk/src/gnome-utils/dialog-transfer.c
   gnucash/trunk/src/gnome-utils/dialog-utils.c
   gnucash/trunk/src/gnome-utils/gnc-account-sel.c
   gnucash/trunk/src/gnome-utils/gnc-amount-edit.h
   gnucash/trunk/src/gnome-utils/gnc-date-format.c
   gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
   gnucash/trunk/src/gnome-utils/gnc-main-window.c
   gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c
   gnucash/trunk/src/gnome-utils/gnc-recurrence.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model-owner.c
   gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c
   gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c
   gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.h
   gnucash/trunk/src/gnome-utils/window-main-summarybar.c
   gnucash/trunk/src/gnome/assistant-acct-period.c
   gnucash/trunk/src/gnome/assistant-hierarchy.c
   gnucash/trunk/src/gnome/assistant-loan.c
   gnucash/trunk/src/gnome/assistant-stock-split.c
   gnucash/trunk/src/gnome/dialog-lot-viewer.c
   gnucash/trunk/src/gnome/dialog-price-editor.c
   gnucash/trunk/src/gnome/dialog-print-check.c
   gnucash/trunk/src/gnome/dialog-tax-info.c
   gnucash/trunk/src/gnome/gnc-plugin-page-budget.c
   gnucash/trunk/src/gnome/window-autoclear.c
   gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c
   gnucash/trunk/src/import-export/aqbanking/gnc-file-aqb-import.c
   gnucash/trunk/src/import-export/import-backend.c
   gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c
   gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
   gnucash/trunk/src/libqof/qof/qofobject.c
   gnucash/trunk/src/libqof/qof/test/test-kvp_frame.c
   gnucash/trunk/src/libqof/qof/test/test-qofbook.c
   gnucash/trunk/src/libqof/qof/test/test-qofinstance.c
   gnucash/trunk/src/libqof/qof/test/test-qofobject.c
   gnucash/trunk/src/python/gncmod-python.c
   gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
   gnucash/trunk/src/report/report-gnome/dialog-column-view.c
   gnucash/trunk/src/report/report-gnome/dialog-custom-report.c
   gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c
   gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
   gnucash/trunk/src/report/report-gnome/window-report.c
   gnucash/trunk/src/report/report-system/gnc-report.c
   gnucash/trunk/src/test-core/test-stuff.c
   gnucash/trunk/src/test-core/test-stuff.h
Log:
Re-indentation of source code.

As usual, re-indentation was done using astyle-1.24 using the following options:

  astyle --indent=spaces=4 --brackets=break --pad-oper --pad-header --suffix=none

Modified: gnucash/trunk/src/app-utils/file-utils.c
===================================================================
--- gnucash/trunk/src/app-utils/file-utils.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/app-utils/file-utils.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -71,11 +71,11 @@
     {
         char * str;
 
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         full_filename = scm_to_locale_string(scm_result);
         return_string = g_strdup (full_filename);
-        scm_dynwind_free (full_filename); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (full_filename);
+        scm_dynwind_end ();
     }
 
     return return_string;

Modified: gnucash/trunk/src/app-utils/gfec.c
===================================================================
--- gnucash/trunk/src/app-utils/gfec.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/app-utils/gfec.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -39,11 +39,11 @@
         {
             char * str;
 
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (result);
             msg = g_strdup (str);
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
         }
     }
 

Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -538,7 +538,7 @@
 
     report_commodity = gnc_default_report_currency ();
     balance = gnc_ui_owner_get_balance_full (owner, negative,
-                                               report_commodity);
+              report_commodity);
     print_info = gnc_commodity_print_info (report_commodity, TRUE);
     return g_strdup (xaccPrintAmount (balance, print_info));
 }
@@ -622,9 +622,9 @@
             g_return_val_if_fail (module, NULL);
 
             get_form = scm_c_eval_string
-                ("(false-if-exception gnc:txf-get-form)");
+                       ("(false-if-exception gnc:txf-get-form)");
             get_desc = scm_c_eval_string
-                ("(false-if-exception gnc:txf-get-description)");
+                       ("(false-if-exception gnc:txf-get-description)");
         }
 
         g_return_val_if_fail (scm_is_procedure (get_form), NULL);
@@ -665,12 +665,12 @@
         {
             if (tax_related)
                 return_string = g_strdup_printf
-                           (_("Tax type %s: invalid code %s for account type"),
-                            tax_type, num_code);
+                                (_("Tax type %s: invalid code %s for account type"),
+                                 tax_type, num_code);
             else
                 return_string = g_strdup_printf
-                           (_("Not tax-related; tax type %s: invalid code %s for account type"),
-                            tax_type, num_code);
+                                (_("Not tax-related; tax type %s: invalid code %s for account type"),
+                                 tax_type, num_code);
         }
         else
         {
@@ -682,12 +682,12 @@
             {
                 if (tax_related)
                     return_string =  g_strdup_printf
-                           (_("Invalid code %s for tax type %s"),
-                            num_code, tax_type);
+                                     (_("Invalid code %s for tax type %s"),
+                                      num_code, tax_type);
                 else
                     return_string =  g_strdup_printf
-                           (_("Not tax-related; invalid code %s for tax type %s"),
-                            num_code, tax_type);
+                                     (_("Not tax-related; invalid code %s for tax type %s"),
+                                      num_code, tax_type);
             }
             else
             {
@@ -698,28 +698,28 @@
                 {
                     if (tax_related)
                         return_string = g_strdup_printf
-                               (_("No form: code %s, tax type %s"), num_code,
-                                tax_type);
+                                        (_("No form: code %s, tax type %s"), num_code,
+                                         tax_type);
                     else
                         return_string = g_strdup_printf
-                               (_("Not tax-related; no form: code %s, tax type %s"),
-                                num_code, tax_type);
+                                        (_("Not tax-related; no form: code %s, tax type %s"),
+                                         num_code, tax_type);
                 }
                 else
                 {
                     SCM desc_scm;
                     desc_scm = scm_call_3 (get_desc, category, code_scm,
-                                            tax_entity_type);
+                                           tax_entity_type);
                     if (!scm_is_string (desc_scm))
                     {
                         if (tax_related)
                             return_string = g_strdup_printf
-                               (_("No description: form %s, code %s, tax type %s"),
-                                form, num_code, tax_type);
+                                            (_("No description: form %s, code %s, tax type %s"),
+                                             form, num_code, tax_type);
                         else
                             return_string = g_strdup_printf
-                               (_("Not tax-related; no description: form %s, code %s, tax type %s"),
-                                form, num_code, tax_type);
+                                            (_("Not tax-related; no description: form %s, code %s, tax type %s"),
+                                             form, num_code, tax_type);
                     }
                     else
                     {
@@ -729,12 +729,12 @@
                         {
                             if (tax_related)
                                 return_string = g_strdup_printf
-                                  (_("No description: form %s, code %s, tax type %s"),
-                                  form, num_code, tax_type);
+                                                (_("No description: form %s, code %s, tax type %s"),
+                                                 form, num_code, tax_type);
                             else
                                 return_string = g_strdup_printf
-                                 (_("Not tax-related; no description: form %s, code %s, tax type %s"),
-                                    form, num_code, tax_type);
+                                                (_("Not tax-related; no description: form %s, code %s, tax type %s"),
+                                                 form, num_code, tax_type);
                         }
                         else
                         {
@@ -742,22 +742,22 @@
                             gchar *copy_txt = NULL;
                             copy_number = xaccAccountGetTaxUSCopyNumber (account);
                             copy_txt = (copy_number == 1) ?
-                                        g_strdup ("") :
-                                        g_strdup_printf ("(%d)",
-                                                       (gint) copy_number);
+                                       g_strdup ("") :
+                                       g_strdup_printf ("(%d)",
+                                                        (gint) copy_number);
                             if (tax_related)
                             {
                                 if (safe_strcmp (form, "") == 0)
                                     return_string = g_strdup_printf ("%s", desc);
                                 else
                                     return_string = g_strdup_printf ("%s%s: %s",
-                                                        form, copy_txt, desc);
+                                                                     form, copy_txt, desc);
                             }
                             else
                             {
                                 return_string = g_strdup_printf
-                                    (_("Not tax-related; %s%s: %s (code %s, tax type %s)"),
-                                     form, copy_txt, desc, num_code, tax_type);
+                                                (_("Not tax-related; %s%s: %s (code %s, tax type %s)"),
+                                                 form, copy_txt, desc, num_code, tax_type);
                             }
                             g_free (copy_txt);
                         }

Modified: gnucash/trunk/src/app-utils/gnc-ui-util.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.h	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.h	2011-08-22 07:10:56 UTC (rev 21205)
@@ -182,8 +182,8 @@
  *  of the balance is indicated via the "negative" parameter.
  */
 gnc_numeric gnc_ui_owner_get_balance_full (GncOwner *owner,
-                                           gboolean *negative,
-                                           const gnc_commodity *commodity);
+        gboolean *negative,
+        const gnc_commodity *commodity);
 
 /** Get the balance for the underlying owner object in string format
  *  and the owner's native currency.
@@ -201,7 +201,7 @@
  *  of the balance is indicated via the "negative" parameter.
  */
 gchar * gnc_ui_owner_get_print_report_balance (GncOwner *owner,
-                                               gboolean *negative);
+        gboolean *negative);
 
 char *gnc_ui_account_get_tax_info_string (const Account *account);
 

Modified: gnucash/trunk/src/app-utils/guile-util.c
===================================================================
--- gnucash/trunk/src/app-utils/guile-util.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/app-utils/guile-util.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -1324,12 +1324,12 @@
     gchar* s;
     char * str;
 
-    scm_dynwind_begin (0); 
+    scm_dynwind_begin (0);
     str = scm_to_locale_string(scm_string);
 
     /* prevent memory leaks in scm_to_locale_string() per guile manual; see 'http://www.gnu.org/software/guile/manual/html_node/Dynamic-Wind.html#Dynamic-Wind' */
     s = g_strdup(str);
-    scm_dynwind_free (str); 
-    scm_dynwind_end (); 
+    scm_dynwind_free (str);
+    scm_dynwind_end ();
     return s;
 }

Modified: gnucash/trunk/src/app-utils/option-util.c
===================================================================
--- gnucash/trunk/src/app-utils/option-util.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/app-utils/option-util.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -923,11 +923,11 @@
     if (!scm_is_string(name))
         return NULL;
 
-    scm_dynwind_begin (0); 
+    scm_dynwind_begin (0);
     str = scm_to_locale_string (name);
     string = g_strdup (str);
-    scm_dynwind_free (str); 
-    scm_dynwind_end (); 
+    scm_dynwind_free (str);
+    scm_dynwind_end ();
 
     return string;
 }
@@ -962,11 +962,11 @@
     if (!scm_is_string(help))
         return NULL;
 
-    scm_dynwind_begin (0); 
+    scm_dynwind_begin (0);
     str = scm_to_locale_string (help);
     string = g_strdup (str);
-    scm_dynwind_free (str); 
-    scm_dynwind_end (); 
+    scm_dynwind_free (str);
+    scm_dynwind_end ();
 
     return string;
 }
@@ -1739,11 +1739,11 @@
             return;
         }
 
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         str = scm_to_locale_string (oops);
         message = g_strdup (str);
-        scm_dynwind_free (str); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (str);
+        scm_dynwind_end ();
         name = gnc_option_name(option);
         section = gnc_option_section(option);
 
@@ -1948,11 +1948,11 @@
     if (!scm_is_string(value))
         return NULL;
 
-    scm_dynwind_begin (0); 
+    scm_dynwind_begin (0);
     str = scm_to_locale_string (value);
     string = g_strdup (str);
-    scm_dynwind_free (str); 
-    scm_dynwind_end (); 
+    scm_dynwind_free (str);
+    scm_dynwind_end ();
     return string;
 }
 
@@ -2062,11 +2062,11 @@
             {
                 char * str;
                 char * string;
-                scm_dynwind_begin (0); 
+                scm_dynwind_begin (0);
                 str = scm_to_locale_string (value);
                 string = g_strdup (str);
-                scm_dynwind_free (str); 
-                scm_dynwind_end (); 
+                scm_dynwind_free (str);
+                scm_dynwind_end ();
                 return string;
             }
         }
@@ -2811,11 +2811,11 @@
         {
             char * tmp_str;
             char * string;
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             tmp_str = scm_to_locale_string (val);
             string = g_strdup (tmp_str);
-            scm_dynwind_free (tmp_str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (tmp_str);
+            scm_dynwind_end ();
             *custom = string;
         }
 

Modified: gnucash/trunk/src/app-utils/test/test-scm-query-string.c
===================================================================
--- gnucash/trunk/src/app-utils/test/test-scm-query-string.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/app-utils/test/test-scm-query-string.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -30,11 +30,11 @@
     args = scm_cons (scm_makfrom0str ("'"), scm_cons (str_q, SCM_EOL));
     str_q = scm_string_append (args);
 
-    scm_dynwind_begin (0); 
+    scm_dynwind_begin (0);
     str = scm_to_locale_string (str_q);
     if (str) str2 = g_strdup(str);
-    scm_dynwind_free (str); 
-    scm_dynwind_end (); 
+    scm_dynwind_free (str);
+    scm_dynwind_end ();
     if (str2)
     {
         res_q = scm_c_eval_string (str2);

Modified: gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
===================================================================
--- gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -628,7 +628,8 @@
         result = NULL;
     }
     return FALSE;
-}static void
+}
+static void
 gnc_dbi_unlock( QofBackend *qbe )
 {
     GncDbiBackend *qe = (GncDbiBackend*)qbe;

Modified: gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -461,7 +461,7 @@
 
 static void
 gnc_plugin_business_cmd_customer_page (GtkAction *action,
-        GncMainWindowActionData *mw)
+                                       GncMainWindowActionData *mw)
 {
     GncPluginPage *page;
 
@@ -578,7 +578,7 @@
 
 static void
 gnc_plugin_business_cmd_vendor_page (GtkAction *action,
-        GncMainWindowActionData *mw)
+                                     GncMainWindowActionData *mw)
 {
     GncPluginPage *page;
 
@@ -695,7 +695,7 @@
 
 static void
 gnc_plugin_business_cmd_employee_page (GtkAction *action,
-        GncMainWindowActionData *mw)
+                                       GncMainWindowActionData *mw)
 {
     GncPluginPage *page;
 

Modified: gnucash/trunk/src/business/business-gnome/gnc-plugin-page-owner-tree.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/gnc-plugin-page-owner-tree.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/business/business-gnome/gnc-plugin-page-owner-tree.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -272,21 +272,21 @@
 
 static action_owners_struct action_owners[] =
 {
-        { "OTEditVendorAction",            GNC_OWNER_VENDOR },
-        { "OTEditCustomerAction",          GNC_OWNER_CUSTOMER },
-        { "OTEditEmployeeAction",          GNC_OWNER_EMPLOYEE },
-        { "OTNewVendorAction",             GNC_OWNER_VENDOR },
-        { "OTNewCustomerAction",           GNC_OWNER_CUSTOMER },
-        { "OTNewEmployeeAction",           GNC_OWNER_EMPLOYEE },
-        { "OTNewBillAction",               GNC_OWNER_VENDOR },
-        { "OTNewInvoiceAction",            GNC_OWNER_CUSTOMER },
-        { "OTNewVoucherAction",            GNC_OWNER_EMPLOYEE },
-        { "OTVendorListingReportAction",   GNC_OWNER_VENDOR },
-        { "OTCustomerListingReportAction", GNC_OWNER_CUSTOMER },
-        { "OTVendorReportAction",          GNC_OWNER_VENDOR },
-        { "OTCustomerReportAction",        GNC_OWNER_CUSTOMER },
-        { "OTEmployeeReportAction",        GNC_OWNER_EMPLOYEE },
-        { NULL, GNC_OWNER_NONE },
+    { "OTEditVendorAction",            GNC_OWNER_VENDOR },
+    { "OTEditCustomerAction",          GNC_OWNER_CUSTOMER },
+    { "OTEditEmployeeAction",          GNC_OWNER_EMPLOYEE },
+    { "OTNewVendorAction",             GNC_OWNER_VENDOR },
+    { "OTNewCustomerAction",           GNC_OWNER_CUSTOMER },
+    { "OTNewEmployeeAction",           GNC_OWNER_EMPLOYEE },
+    { "OTNewBillAction",               GNC_OWNER_VENDOR },
+    { "OTNewInvoiceAction",            GNC_OWNER_CUSTOMER },
+    { "OTNewVoucherAction",            GNC_OWNER_EMPLOYEE },
+    { "OTVendorListingReportAction",   GNC_OWNER_VENDOR },
+    { "OTCustomerListingReportAction", GNC_OWNER_CUSTOMER },
+    { "OTVendorReportAction",          GNC_OWNER_VENDOR },
+    { "OTCustomerReportAction",        GNC_OWNER_CUSTOMER },
+    { "OTEmployeeReportAction",        GNC_OWNER_EMPLOYEE },
+    { NULL, GNC_OWNER_NONE },
 };
 
 GType
@@ -310,8 +310,8 @@
         };
 
         gnc_plugin_page_owner_tree_type = g_type_register_static (GNC_TYPE_PLUGIN_PAGE,
-                                            GNC_PLUGIN_PAGE_OWNER_TREE_NAME,
-                                            &our_info, 0);
+                                          GNC_PLUGIN_PAGE_OWNER_TREE_NAME,
+                                          &our_info, 0);
     }
 
     return gnc_plugin_page_owner_tree_type;
@@ -332,7 +332,7 @@
     gint          i;
 
     g_return_val_if_fail( (owner_type != GNC_OWNER_UNDEFINED)
-                           && (owner_type != GNC_OWNER_NONE), NULL);
+                          && (owner_type != GNC_OWNER_NONE), NULL);
     ENTER(" ");
 
     /* Is there an existing page? */
@@ -656,8 +656,8 @@
  *  @param group_name The group name to use when saving data. */
 static void
 gnc_plugin_page_owner_tree_save_page (GncPluginPage *plugin_page,
-                                        GKeyFile *key_file,
-                                        const gchar *group_name)
+                                      GKeyFile *key_file,
+                                      const gchar *group_name)
 {
     GncPluginPageOwnerTree *owner_page;
     GncPluginPageOwnerTreePrivate *priv;
@@ -676,7 +676,7 @@
                            priv->owner_type);
 
     gnc_tree_view_owner_save(GNC_TREE_VIEW_OWNER(priv->tree_view),
-                               &priv->fd, key_file, group_name);
+                             &priv->fd, key_file, group_name);
     LEAVE(" ");
 }
 
@@ -715,7 +715,7 @@
     gnc_main_window_open_page(GNC_MAIN_WINDOW(window), page);
 
     gnc_tree_view_owner_restore(GNC_TREE_VIEW_OWNER(priv->tree_view),
-                                  &priv->fd, key_file, group_name, owner_type);
+                                &priv->fd, key_file, group_name, owner_type);
     LEAVE(" ");
     return page;
 }
@@ -843,7 +843,7 @@
 
     args = SCM_EOL;
 
-    switch(owner_type)
+    switch (owner_type)
     {
     case GNC_OWNER_NONE :
     case GNC_OWNER_UNDEFINED :
@@ -1093,25 +1093,25 @@
     case GNC_OWNER_CUSTOMER :
     {
         gncOwnerInitCustomer(&current_owner,
-                gncOwnerGetCustomer(gnc_plugin_page_owner_tree_get_current_owner (page)) );
+                             gncOwnerGetCustomer(gnc_plugin_page_owner_tree_get_current_owner (page)) );
         break;
     }
     case GNC_OWNER_JOB :
     {
         gncOwnerInitJob(&current_owner,
-                gncOwnerGetJob(gnc_plugin_page_owner_tree_get_current_owner (page)) );
+                        gncOwnerGetJob(gnc_plugin_page_owner_tree_get_current_owner (page)) );
         break;
     }
     case GNC_OWNER_VENDOR :
     {
         gncOwnerInitVendor(&current_owner,
-                gncOwnerGetVendor(gnc_plugin_page_owner_tree_get_current_owner (page)) );
+                           gncOwnerGetVendor(gnc_plugin_page_owner_tree_get_current_owner (page)) );
         break;
     }
     case GNC_OWNER_EMPLOYEE :
     {
         gncOwnerInitEmployee(&current_owner,
-                gncOwnerGetEmployee(gnc_plugin_page_owner_tree_get_current_owner (page)) );
+                             gncOwnerGetEmployee(gnc_plugin_page_owner_tree_get_current_owner (page)) );
         break;
     }
     }

Modified: gnucash/trunk/src/engine/Account.h
===================================================================
--- gnucash/trunk/src/engine/Account.h	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/engine/Account.h	2011-08-22 07:10:56 UTC (rev 21205)
@@ -293,7 +293,7 @@
 void xaccAccountSetLastNum (Account *account, const char *num);
 /** Set the account's lot order policy */
 void gnc_account_set_policy (Account *account, GNCPolicy *policy);
-/** Returns the account's account type. 
+/** Returns the account's account type.
  *
  * This must not be confused with the \ref GType as returned by
  * gnc_account_get_type(), which is related to glib's type system. */
@@ -508,7 +508,8 @@
 void xaccAccountSetCommodity (Account *account, gnc_commodity *comm);
 
 /** Get the account's commodity  */
-/*@ dependent @*/ gnc_commodity * xaccAccountGetCommodity (const Account *account);
+/*@ dependent @*/
+gnc_commodity * xaccAccountGetCommodity (const Account *account);
 
 /** Return the SCU for the account.  If a non-standard SCU has been
  *   set for the account, that is returned; else the default SCU for

Modified: gnucash/trunk/src/engine/gncOwner.c
===================================================================
--- gnucash/trunk/src/engine/gncOwner.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/engine/gncOwner.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -1035,7 +1035,7 @@
             GNCLot *lot = lot_node->data;
             gnc_numeric lot_balance = gnc_lot_get_balance (lot);
             balance = gnc_numeric_add (balance, lot_balance,
-                      gnc_commodity_get_fraction (owner_currency), GNC_HOW_RND_ROUND_HALF_UP);
+                                       gnc_commodity_get_fraction (owner_currency), GNC_HOW_RND_ROUND_HALF_UP);
         }
     }
 

Modified: gnucash/trunk/src/gnc-module/gnc-module.c
===================================================================
--- gnucash/trunk/src/gnc-module/gnc-module.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnc-module/gnc-module.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -433,7 +433,7 @@
     GModule         * gmodule;
     GNCModuleInfo   * modinfo;
 
-    ENTER("module_name: %s",module_name);
+    ENTER("module_name: %s", module_name);
 
     if (!loaded_modules)
     {

Modified: gnucash/trunk/src/gnome/assistant-acct-period.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-acct-period.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome/assistant-acct-period.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -86,7 +86,7 @@
 
 void     ap_assistant_window_destroy_cb (GtkObject *object, gpointer user_data);
 void     ap_assistant_prepare           (GtkAssistant  *assistant, GtkWidget *page,
-        				gpointer user_data);
+        gpointer user_data);
 void     ap_assistant_menu_prepare      (GtkAssistant *assistant, gpointer user_data);
 void	 ap_assistant_book_prepare 	(GtkAssistant *assistant, gpointer user_data);
 void	 ap_assistant_apply_prepare 	(GtkAssistant *assistant, gpointer user_data);
@@ -233,31 +233,31 @@
 
 /* =============================================================== */
 
-void 
+void
 ap_assistant_prepare (GtkAssistant *assistant, GtkWidget *page,
-        gpointer user_data)
+                      gpointer user_data)
 {
     AcctPeriodInfo *info = user_data;
     gint currentpage = gtk_assistant_get_current_page(assistant);
 
     switch (currentpage)
     {
-        case 1:
-            /* Current page is Menu page */
-             ap_assistant_menu_prepare(assistant, user_data);
-            break;
-        case 2:
-            /* Current page is Book page */
-             ap_assistant_book_prepare (assistant, user_data);
-            break;
-        case 3:
-            /* Current page is Apply page */
-             ap_assistant_apply_prepare (assistant, user_data);
-            break;
-        case 4:
-            /* Current page is Summary page */
-             ap_assistant_summary_prepare (assistant, user_data);
-            break;
+    case 1:
+        /* Current page is Menu page */
+        ap_assistant_menu_prepare(assistant, user_data);
+        break;
+    case 2:
+        /* Current page is Book page */
+        ap_assistant_book_prepare (assistant, user_data);
+        break;
+    case 3:
+        /* Current page is Apply page */
+        ap_assistant_apply_prepare (assistant, user_data);
+        break;
+    case 4:
+        /* Current page is Summary page */
+        ap_assistant_summary_prepare (assistant, user_data);
+        break;
     }
 }
 
@@ -298,9 +298,9 @@
         period_begin = period_end;
         recurrenceListNextInstance(info->period, &period_begin, &period_end);
 
-    /* FIXME Check for valid period_end, not sure why it wont be!!! */
-    if (g_date_valid (&period_end) != TRUE)
-       break;
+        /* FIXME Check for valid period_end, not sure why it wont be!!! */
+        if (g_date_valid (&period_end) != TRUE)
+            break;
     }
 
     /* Find the date of the earliest transaction in the current book.
@@ -423,7 +423,7 @@
 
 /* =============================================================== */
 
-gboolean 
+gboolean
 ap_validate_menu (GtkAssistant *assistant, gpointer user_data)
 {
     GDate date_now;
@@ -437,7 +437,7 @@
 
     if (0 <= g_date_compare(&info->prev_closing_date, &info->closing_date))
     {
-	/* Closing date must be greater than closing date of previous book */
+        /* Closing date must be greater than closing date of previous book */
         return FALSE;
     }
 
@@ -445,7 +445,7 @@
     g_date_set_time_t (&date_now, time(NULL));
     if (0 < g_date_compare(&info->closing_date, &date_now))
     {
-	/* Closing date must be in the future */
+        /* Closing date must be in the future */
         return FALSE;
     }
     return TRUE;
@@ -470,7 +470,7 @@
 {
     AcctPeriodInfo *info = user_data;
     GtkTextBuffer * buffer;
-    GtkTextIter startiter,enditer;
+    GtkTextIter startiter, enditer;
     gint len;
     QofBook *closed_book = NULL, *current_book;
     const char *btitle;
@@ -488,7 +488,7 @@
     gtk_text_buffer_get_iter_at_offset(buffer, &startiter, 0);
     gtk_text_buffer_get_iter_at_offset(buffer, &enditer, len);
 
-    bnotes = gtk_text_buffer_get_text(buffer,&startiter,&enditer ,0);
+    bnotes = gtk_text_buffer_get_text(buffer, &startiter, &enditer , 0);
     PINFO("Book title is - %s\n", btitle);
 
     timespecFromTime_t (&closing_date,
@@ -504,7 +504,7 @@
 
 
     /* FIXME Test for valid closing date, not sure why it wont be!!! */
-    if(g_date_valid(&info->closing_date) == TRUE)
+    if (g_date_valid(&info->closing_date) == TRUE)
     {
         /* If the next closing date is in the future, then we are done. */
         if (time(NULL) > gnc_timet_get_day_end_gdate (&info->closing_date))
@@ -512,7 +512,7 @@
             /* Load up the GUI for the next closing period. */
             gnc_frequency_setup_recurrence(info->period_menu, NULL, &info->closing_date);
             /* Jump back to the Close Book page. */
-            gtk_assistant_set_current_page (GTK_ASSISTANT(info->window),1);
+            gtk_assistant_set_current_page (GTK_ASSISTANT(info->window), 1);
         }
     }
 }
@@ -549,7 +549,7 @@
     GtkWidget *box;
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file  (builder ,"assistant-acct-period.glade", "Account Period Assistant");
+    gnc_builder_add_from_file  (builder , "assistant-acct-period.glade", "Account Period Assistant");
     window = GTK_WIDGET(gtk_builder_get_object (builder, "Account Period Assistant"));
     info->window = window;
 

Modified: gnucash/trunk/src/gnome/assistant-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-hierarchy.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome/assistant-hierarchy.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -102,7 +102,7 @@
 } hierarchy_data;
 
 void on_prepare (GtkAssistant  *assistant, GtkWidget *page,
-        hierarchy_data  *data);
+                 hierarchy_data  *data);
 void on_choose_account_categories_prepare (hierarchy_data  *data);
 void select_all_clicked (GtkButton       *button,
                          hierarchy_data  *data);
@@ -429,20 +429,20 @@
 }
 
 void on_prepare (GtkAssistant  *assistant, GtkWidget *page,
-        hierarchy_data  *data)
+                 hierarchy_data  *data)
 {
     gint currentpage = gtk_assistant_get_current_page(assistant);
 
     switch (gtk_assistant_get_current_page(assistant))
     {
-        case 2:
-            /* Current page is account selection */
-            on_choose_account_categories_prepare(data);
-            break;
-        case 3:
-            /* Current page is final account page */
-            on_final_account_prepare (data);
-            break;
+    case 2:
+        /* Current page is account selection */
+        on_choose_account_categories_prepare(data);
+        break;
+    case 3:
+        /* Current page is final account page */
+        on_final_account_prepare (data);
+        break;
     }
 
 }
@@ -1014,14 +1014,14 @@
     Account * root;
     ENTER (" ");
     com = gnc_currency_edit_get_currency (GNC_CURRENCY_EDIT(data->currency_selector));
-    
+
     if (data->our_account_tree)
     {
         gnc_account_foreach_descendant (data->our_account_tree,
                                         (AccountCb)starting_balance_helper,
                                         data);
-    
-      
+
+
     }
 
     // delete before we suspend GUI events, and then muck with the model,
@@ -1033,17 +1033,17 @@
     gnc_suspend_gui_refresh ();
 
     account_trees_merge(gnc_get_current_root_account(), data->our_account_tree);
-    
+
     delete_our_account_tree (data);
 
     when_completed = data->when_completed;
     g_free(data);
-    
+
     root = gnc_get_current_root_account();
     xaccAccountSetCommodity(root, com);
-    
+
     gnc_resume_gui_refresh ();
-    
+
     if (when_completed)
     {
         (*when_completed)();
@@ -1104,10 +1104,10 @@
     data->category_description = GTK_TEXT_VIEW(gtk_builder_get_object (builder, "account_types_description"));
     data->account_list_added = FALSE;
 
-/* FIXME -- what is this ?
-    color = &GNOME_DRUID_PAGE_EDGE(start_page)->textbox_color;
-    gtk_widget_modify_base(GTK_WIDGET(data->category_description), GTK_STATE_INSENSITIVE, color);
-    */
+    /* FIXME -- what is this ?
+        color = &GNOME_DRUID_PAGE_EDGE(start_page)->textbox_color;
+        gtk_widget_modify_base(GTK_WIDGET(data->category_description), GTK_STATE_INSENSITIVE, color);
+        */
 
     /* Final Accounts Page */
     data->final_account_tree_container = GTK_WIDGET(gtk_builder_get_object (builder, "final_account_tree_box"));
@@ -1134,7 +1134,7 @@
 
 GtkWidget*
 gnc_ui_hierarchy_assistant_with_callback(gboolean use_defaults,
-                                     GncHierarchyAssistantFinishedCallback when_finished)
+        GncHierarchyAssistantFinishedCallback when_finished)
 {
     return gnc_create_hierarchy_assistant(use_defaults, when_finished);
 }

Modified: gnucash/trunk/src/gnome/assistant-loan.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-loan.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome/assistant-loan.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -452,12 +452,12 @@
 
     builder = gtk_builder_new();
 
-    gnc_builder_add_from_file  (builder ,"assistant-loan.glade", "len_liststore");
-    gnc_builder_add_from_file  (builder ,"assistant-loan.glade", "range_liststore");
-    gnc_builder_add_from_file  (builder ,"assistant-loan.glade", "type_liststore");
-    gnc_builder_add_from_file  (builder ,"assistant-loan.glade", "rate_liststore");
+    gnc_builder_add_from_file  (builder , "assistant-loan.glade", "len_liststore");
+    gnc_builder_add_from_file  (builder , "assistant-loan.glade", "range_liststore");
+    gnc_builder_add_from_file  (builder , "assistant-loan.glade", "type_liststore");
+    gnc_builder_add_from_file  (builder , "assistant-loan.glade", "rate_liststore");
 
-    gnc_builder_add_from_file  (builder ,"assistant-loan.glade", "Loan-Mortgage Assistant");
+    gnc_builder_add_from_file  (builder , "assistant-loan.glade", "Loan-Mortgage Assistant");
     window = GTK_WIDGET(gtk_builder_get_object (builder, "Loan-Mortgage Assistant"));
     ldd->window = window;
 
@@ -479,58 +479,58 @@
     /* Information Page */
     {
         ldd->prmTable = GTK_TABLE(gtk_builder_get_object(builder, "param_table"));
-	ldd->prmVarFrame = GTK_FRAME(gtk_builder_get_object(builder, "type_freq_frame"));
-	ldd->prmIrateSpin = GTK_SPIN_BUTTON (gtk_builder_get_object(builder, "irate_spin"));
-	ldd->prmType = GTK_COMBO_BOX (gtk_builder_get_object(builder, "type_combobox"));
-        gtk_combo_box_set_active( GTK_COMBO_BOX( ldd->prmType), 0 ); 
-	ldd->prmLengthSpin = GTK_SPIN_BUTTON (gtk_builder_get_object(builder, "len_spin"));
-	ldd->prmLengthType = GTK_COMBO_BOX (gtk_builder_get_object(builder, "len_opt"));
-        gtk_combo_box_set_active( GTK_COMBO_BOX( ldd->prmLengthType), 0 ); 
-	ldd->prmRemainSpin = GTK_SPIN_BUTTON (gtk_builder_get_object(builder, "rem_spin"));
-	ldd->prmIrateType = GTK_COMBO_BOX (gtk_builder_get_object(builder, "irate_type_combobox"));
+        ldd->prmVarFrame = GTK_FRAME(gtk_builder_get_object(builder, "type_freq_frame"));
+        ldd->prmIrateSpin = GTK_SPIN_BUTTON (gtk_builder_get_object(builder, "irate_spin"));
+        ldd->prmType = GTK_COMBO_BOX (gtk_builder_get_object(builder, "type_combobox"));
+        gtk_combo_box_set_active( GTK_COMBO_BOX( ldd->prmType), 0 );
+        ldd->prmLengthSpin = GTK_SPIN_BUTTON (gtk_builder_get_object(builder, "len_spin"));
+        ldd->prmLengthType = GTK_COMBO_BOX (gtk_builder_get_object(builder, "len_opt"));
+        gtk_combo_box_set_active( GTK_COMBO_BOX( ldd->prmLengthType), 0 );
+        ldd->prmRemainSpin = GTK_SPIN_BUTTON (gtk_builder_get_object(builder, "rem_spin"));
+        ldd->prmIrateType = GTK_COMBO_BOX (gtk_builder_get_object(builder, "irate_type_combobox"));
         gtk_combo_box_set_active( GTK_COMBO_BOX( ldd->prmIrateType), 0 );
-	/* ldd->prmStartDateGDE */
+        /* ldd->prmStartDateGDE */
     }
     /* Repayment Page */
     {
         ldd->repTable = GTK_TABLE(gtk_builder_get_object(builder, "repay_table"));
-	ldd->repTxnName = GTK_ENTRY(gtk_builder_get_object(builder, "txn_title"));
-	ldd->repAmtEntry = GTK_ENTRY(gtk_builder_get_object(builder, "amount_ent"));
-	ldd->repFreqFrame = GTK_FRAME(gtk_builder_get_object(builder, "freq_frame"));
+        ldd->repTxnName = GTK_ENTRY(gtk_builder_get_object(builder, "txn_title"));
+        ldd->repAmtEntry = GTK_ENTRY(gtk_builder_get_object(builder, "amount_ent"));
+        ldd->repFreqFrame = GTK_FRAME(gtk_builder_get_object(builder, "freq_frame"));
     }
     /* Options Page */
     {
         ldd->optVBox = GTK_VBOX(gtk_builder_get_object(builder, "loan_options_page"));
-	ldd->optEscrowCb = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, "opt_escrow_cb"));
-	ldd->optEscrowHBox = GTK_HBOX(gtk_builder_get_object(builder, "opt_escrow_hbox"));
+        ldd->optEscrowCb = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, "opt_escrow_cb"));
+        ldd->optEscrowHBox = GTK_HBOX(gtk_builder_get_object(builder, "opt_escrow_hbox"));
     }
     /* Payment Page */
     {
         ldd->payTable = GTK_TABLE(gtk_builder_get_object(builder, "pay_table"));
-	ldd->payTxnName = GTK_ENTRY(gtk_builder_get_object(builder, "pay_txn_title"));
-	ldd->payAmtEntry = GTK_ENTRY(gtk_builder_get_object(builder, "pay_amt_ent"));
-	ldd->payUseEscrow = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, "pay_use_escrow"));
-	ldd->paySpecSrcAcct = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, "pay_specify_source"));
-	ldd->payAcctFromLabel = GTK_LABEL(gtk_builder_get_object(builder, "pay_from_account_label"));
-	ldd->payEscToLabel = GTK_LABEL(gtk_builder_get_object(builder, "pay_escrow_to_label"));
-	ldd->payEscFromLabel = GTK_LABEL(gtk_builder_get_object(builder, "pay_escrow_from_label"));
-	ldd->payTxnFreqPartRb = GTK_RADIO_BUTTON(gtk_builder_get_object(builder, "pay_txn_part_rb"));
-	ldd->payTxnFreqUniqRb = GTK_RADIO_BUTTON(gtk_builder_get_object(builder, "pay_uniq_freq_rb"));
-	ldd->payFreqAlign = GTK_ALIGNMENT(gtk_builder_get_object(builder, "pay_freq_align"));
+        ldd->payTxnName = GTK_ENTRY(gtk_builder_get_object(builder, "pay_txn_title"));
+        ldd->payAmtEntry = GTK_ENTRY(gtk_builder_get_object(builder, "pay_amt_ent"));
+        ldd->payUseEscrow = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, "pay_use_escrow"));
+        ldd->paySpecSrcAcct = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, "pay_specify_source"));
+        ldd->payAcctFromLabel = GTK_LABEL(gtk_builder_get_object(builder, "pay_from_account_label"));
+        ldd->payEscToLabel = GTK_LABEL(gtk_builder_get_object(builder, "pay_escrow_to_label"));
+        ldd->payEscFromLabel = GTK_LABEL(gtk_builder_get_object(builder, "pay_escrow_from_label"));
+        ldd->payTxnFreqPartRb = GTK_RADIO_BUTTON(gtk_builder_get_object(builder, "pay_txn_part_rb"));
+        ldd->payTxnFreqUniqRb = GTK_RADIO_BUTTON(gtk_builder_get_object(builder, "pay_uniq_freq_rb"));
+        ldd->payFreqAlign = GTK_ALIGNMENT(gtk_builder_get_object(builder, "pay_freq_align"));
     }
     /* Review Page */
     {
         ldd->revTable = GTK_TABLE(gtk_builder_get_object(builder, "rev_date_range_table"));
-	ldd->revRangeOpt = GTK_COMBO_BOX(gtk_builder_get_object(builder, "rev_range_opt"));
-	ldd->revDateFrame = GTK_FRAME(gtk_builder_get_object(builder, "rev_date_frame"));
-	ldd->revScrollWin = GTK_SCROLLED_WINDOW(gtk_builder_get_object(builder, "rev_scrollwin"));
-	/* GNCDateEdit       *revStartDate */
-	/* GNCDateEdit       *revEndDate   */
+        ldd->revRangeOpt = GTK_COMBO_BOX(gtk_builder_get_object(builder, "rev_range_opt"));
+        ldd->revDateFrame = GTK_FRAME(gtk_builder_get_object(builder, "rev_date_frame"));
+        ldd->revScrollWin = GTK_SCROLLED_WINDOW(gtk_builder_get_object(builder, "rev_scrollwin"));
+        /* GNCDateEdit       *revStartDate */
+        /* GNCDateEdit       *revEndDate   */
     }
 
     /* non-buildable widget setup */
     {
-	GtkWidget *butt;
+        GtkWidget *butt;
         int i;
         // ACCT_TYPE_LIABILITY
         GList *liabilityAcct;
@@ -796,22 +796,22 @@
         g_signal_connect( ldd->payTxnFreqUniqRb, "toggled",
                           G_CALLBACK(loan_pay_freq_toggle_cb), ldd );
 
-	{
-	GtkHBox *hbox;
-	hbox = GTK_HBOX(gtk_builder_get_object(builder, "type_freq_hbox"));
-        ldd->prmVarGncFreq = GNC_FREQUENCY(gnc_frequency_new( NULL, NULL ));
-        gtk_box_pack_start( GTK_BOX(hbox) , GTK_WIDGET(ldd->prmVarGncFreq), TRUE, FALSE, 0 );
-        g_signal_connect (ldd->prmVarGncFreq, "changed",
-                          G_CALLBACK (loan_info_page_valid_cb), ldd);
-	}
-	{
-	GtkHBox *hbox;
-	hbox = GTK_HBOX(gtk_builder_get_object(builder, "freq_frame_hbox"));
-        ldd->repGncFreq = GNC_FREQUENCY(gnc_frequency_new( NULL, NULL ));
-        gtk_box_pack_start( GTK_BOX(hbox) , GTK_WIDGET(ldd->repGncFreq), TRUE, FALSE, 0 );
-        g_signal_connect (ldd->repGncFreq, "changed",
-                          G_CALLBACK (loan_rep_page_valid_cb), ldd);
-	}
+        {
+            GtkHBox *hbox;
+            hbox = GTK_HBOX(gtk_builder_get_object(builder, "type_freq_hbox"));
+            ldd->prmVarGncFreq = GNC_FREQUENCY(gnc_frequency_new( NULL, NULL ));
+            gtk_box_pack_start( GTK_BOX(hbox) , GTK_WIDGET(ldd->prmVarGncFreq), TRUE, FALSE, 0 );
+            g_signal_connect (ldd->prmVarGncFreq, "changed",
+                              G_CALLBACK (loan_info_page_valid_cb), ldd);
+        }
+        {
+            GtkHBox *hbox;
+            hbox = GTK_HBOX(gtk_builder_get_object(builder, "freq_frame_hbox"));
+            ldd->repGncFreq = GNC_FREQUENCY(gnc_frequency_new( NULL, NULL ));
+            gtk_box_pack_start( GTK_BOX(hbox) , GTK_WIDGET(ldd->repGncFreq), TRUE, FALSE, 0 );
+            g_signal_connect (ldd->repGncFreq, "changed",
+                              G_CALLBACK (loan_rep_page_valid_cb), ldd);
+        }
 
         ldd->payGncFreq = GNC_FREQUENCY(gnc_frequency_new( NULL, NULL ));
         gtk_container_add( GTK_CONTAINER(ldd->payFreqAlign), GTK_WIDGET(ldd->payGncFreq) );
@@ -833,7 +833,7 @@
         g_signal_connect (ldd->prmAccountGAS, "account_sel_changed",
                           G_CALLBACK (loan_info_page_valid_cb), ldd);
         g_signal_connect( ldd->prmIrateType, "changed",
-                              G_CALLBACK( loan_info_page_valid_cb ), ldd );
+                          G_CALLBACK( loan_info_page_valid_cb ), ldd );
     }
     /* Opts page Call Back */
     {
@@ -843,7 +843,7 @@
     /* Rep page Call Back */
     {
         g_signal_connect (ldd->repAssetsFromGAS, "account_sel_changed",
-                          G_CALLBACK (loan_rep_page_valid_cb), ldd); 
+                          G_CALLBACK (loan_rep_page_valid_cb), ldd);
         g_signal_connect (ldd->repIntToGAS, "account_sel_changed",
                           G_CALLBACK (loan_rep_page_valid_cb), ldd);
         g_signal_connect (ldd->repPrincToGAS, "account_sel_changed",
@@ -930,8 +930,8 @@
                     = g_new0( RepayOptData, 1 );
 
         optData->enabled        = FALSE;
-	optData->optValid	= FALSE;
-	optData->FreqUniq	= FALSE;
+        optData->optValid	= FALSE;
+        optData->FreqUniq	= FALSE;
         optData->name           = g_strdup( _(REPAY_DEFAULTS[i].name) );
         optData->txnMemo        = g_strdup( _(REPAY_DEFAULTS[i].
                                               defaultTxnMemo) );
@@ -1032,13 +1032,13 @@
 void
 loan_info_page_valid_cb (GtkWidget *widget, gpointer user_data )
 {
-   LoanAssistantData *ldd = user_data;
-   GtkAssistant *assistant = GTK_ASSISTANT(ldd->window);
-   gint num = gtk_assistant_get_current_page (assistant);
-   GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
+    LoanAssistantData *ldd = user_data;
+    GtkAssistant *assistant = GTK_ASSISTANT(ldd->window);
+    gint num = gtk_assistant_get_current_page (assistant);
+    GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
 
-   gtk_assistant_set_page_complete (assistant, page,
-       loan_info_page_complete (assistant, ldd));
+    gtk_assistant_set_page_complete (assistant, page,
+                                     loan_info_page_complete (assistant, ldd));
 }
 
 
@@ -1193,16 +1193,16 @@
     gtk_widget_set_sensitive( GTK_WIDGET(ldd->optEscrowHBox), newState );
     /* Check for Valid Account if enabled */
     if (newState)
-       {
-       if (GNC_ACCOUNT_SEL( ldd->ld.escrowAcct) == NULL)
-	   gtk_assistant_set_page_complete (assistant, page, FALSE);
-       }
+    {
+        if (GNC_ACCOUNT_SEL( ldd->ld.escrowAcct) == NULL)
+            gtk_assistant_set_page_complete (assistant, page, FALSE);
+    }
     else
-       {
-       ldd->ld.escrowAcct = NULL;
-       gnc_account_sel_set_account( GNC_ACCOUNT_SEL( ldd->optEscrowGAS), NULL , FALSE );
-       gtk_assistant_set_page_complete (assistant, page, TRUE);
-       }
+    {
+        ldd->ld.escrowAcct = NULL;
+        gnc_account_sel_set_account( GNC_ACCOUNT_SEL( ldd->optEscrowGAS), NULL , FALSE );
+        gtk_assistant_set_page_complete (assistant, page, TRUE);
+    }
 
 
     /* deal with escrow options. */
@@ -1255,14 +1255,14 @@
 void
 loan_opt_page_valid_cb (GtkWidget *widget, gpointer user_data )
 {
-   LoanAssistantData *ldd = user_data;
+    LoanAssistantData *ldd = user_data;
 
-   GtkAssistant *assistant = GTK_ASSISTANT(ldd->window);
-   gint num = gtk_assistant_get_current_page (assistant);
-   GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
+    GtkAssistant *assistant = GTK_ASSISTANT(ldd->window);
+    gint num = gtk_assistant_get_current_page (assistant);
+    GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
 
-   gtk_assistant_set_page_complete (assistant, page,
-       loan_opt_page_complete (assistant, ldd));
+    gtk_assistant_set_page_complete (assistant, page,
+                                     loan_opt_page_complete (assistant, ldd));
 }
 
 
@@ -1276,7 +1276,7 @@
     {
         ldd->ld.escrowAcct =
             gnc_account_sel_get_account( ldd->optEscrowGAS );
-	/* Test for valid Account */
+        /* Test for valid Account */
         if ( ldd->ld.escrowAcct == NULL )
             return FALSE;
     }
@@ -1330,8 +1330,8 @@
             ;
         if ( i < ldd->ld.repayOptCount )
             ldd->currentIdx = i;
-	else
-	    ldd->currentIdx = -1;
+        else
+            ldd->currentIdx = -1;
     }
 }
 
@@ -1339,13 +1339,13 @@
 void
 loan_rep_page_valid_cb (GtkWidget *widget, gpointer user_data )
 {
-   LoanAssistantData *ldd = user_data;
-   GtkAssistant *assistant = GTK_ASSISTANT(ldd->window);
-   gint num = gtk_assistant_get_current_page (assistant);
-   GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
+    LoanAssistantData *ldd = user_data;
+    GtkAssistant *assistant = GTK_ASSISTANT(ldd->window);
+    gint num = gtk_assistant_get_current_page (assistant);
+    GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
 
-   gtk_assistant_set_page_complete (assistant, page,
-       loan_rep_page_complete (assistant, ldd));
+    gtk_assistant_set_page_complete (assistant, page,
+                                     loan_rep_page_complete (assistant, ldd));
 }
 
 
@@ -1430,7 +1430,7 @@
     /* Step over page if no options enabled */
     if (ldd->currentIdx == -1 )
     {
-  	gtk_assistant_set_current_page (assistant, num + 1);
+        gtk_assistant_set_current_page (assistant, num + 1);
     }
     else
     {
@@ -1441,7 +1441,7 @@
         str = g_string_sized_new( 32 );
         /* Translators: %s is "Taxes", or "Insurance", or similar */
         g_string_printf( str, _("Loan Repayment Option: \"%s\""), rod->name );
-    	gtk_assistant_set_page_title (assistant, page, str->str );
+        gtk_assistant_set_page_title (assistant, page, str->str );
 
         /* copy in the relevant data from the currently-indexed option. */
         gtk_entry_set_text( ldd->payTxnName, rod->txnMemo );
@@ -1449,62 +1449,62 @@
         gtk_entry_set_text( ldd->payAmtEntry, str->str );
 
         gtk_widget_set_sensitive( GTK_WIDGET(ldd->payUseEscrow),
-                              (ldd->ld.escrowAcct != NULL) );
+                                  (ldd->ld.escrowAcct != NULL) );
 
         {
             g_signal_handlers_block_by_func( ldd->payUseEscrow,
-                                         loan_pay_use_esc_toggle_cb,
-                                         ldd );
+                                             loan_pay_use_esc_toggle_cb,
+                                             ldd );
 
             loan_pay_use_esc_setup( ldd,
-                              (ldd->ld.escrowAcct != NULL)
-                              && rod->throughEscrowP );
+                                    (ldd->ld.escrowAcct != NULL)
+                                    && rod->throughEscrowP );
             gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(ldd->payUseEscrow),
-                                      (rod->throughEscrowP
-                                       && ldd->ld.escrowAcct != NULL) );
+                                          (rod->throughEscrowP
+                                           && ldd->ld.escrowAcct != NULL) );
 
             g_signal_handlers_unblock_by_func( ldd->payUseEscrow,
-                                           loan_pay_use_esc_toggle_cb,
-                                           ldd );
+                                               loan_pay_use_esc_toggle_cb,
+                                               ldd );
         }
 
         {
             g_signal_handlers_block_by_func( ldd->paySpecSrcAcct,
-                                         loan_pay_spec_src_toggle_cb,
-                                         ldd );
+                                             loan_pay_spec_src_toggle_cb,
+                                             ldd );
             loan_pay_spec_src_setup( ldd, rod->specSrcAcctP );
             gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(ldd->paySpecSrcAcct),
-                                      rod->specSrcAcctP );
+                                          rod->specSrcAcctP );
 
             g_signal_handlers_unblock_by_func( ldd->paySpecSrcAcct,
-                                           loan_pay_spec_src_toggle_cb,
-                                           ldd );
+                                               loan_pay_spec_src_toggle_cb,
+                                               ldd );
         }
 
-	g_signal_handlers_block_by_func(ldd->payAcctToGAS, loan_pay_page_valid_cb, ldd );
+        g_signal_handlers_block_by_func(ldd->payAcctToGAS, loan_pay_page_valid_cb, ldd );
         gnc_account_sel_set_account( ldd->payAcctToGAS,   rod->to, FALSE );
-	g_signal_handlers_unblock_by_func(ldd->payAcctToGAS, loan_pay_page_valid_cb, ldd );
+        g_signal_handlers_unblock_by_func(ldd->payAcctToGAS, loan_pay_page_valid_cb, ldd );
 
 
-	g_signal_handlers_block_by_func(ldd->payTxnFreqUniqRb, loan_pay_freq_toggle_cb, ldd );
+        g_signal_handlers_block_by_func(ldd->payTxnFreqUniqRb, loan_pay_freq_toggle_cb, ldd );
         gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(ldd->payTxnFreqPartRb), !rod->FreqUniq );
         gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(ldd->payTxnFreqUniqRb), rod->FreqUniq );
-	g_signal_handlers_unblock_by_func(ldd->payTxnFreqUniqRb, loan_pay_freq_toggle_cb, ldd );
+        g_signal_handlers_unblock_by_func(ldd->payTxnFreqUniqRb, loan_pay_freq_toggle_cb, ldd );
 
         gtk_widget_set_sensitive( GTK_WIDGET(ldd->payFreqAlign), rod->FreqUniq );
 
         if ( rod->FreqUniq )
         {
-	g_signal_handlers_disconnect_by_func( ldd->payGncFreq, loan_pay_page_valid_cb, ldd );
-        gtk_container_remove( GTK_CONTAINER(ldd->payFreqAlign), GTK_WIDGET(ldd->payGncFreq) );
-	ldd->payGncFreq = NULL;
-        ldd->payGncFreq = GNC_FREQUENCY(gnc_frequency_new_from_recurrence( rod->schedule, rod->startDate ));
-        gtk_container_add( GTK_CONTAINER(ldd->payFreqAlign), GTK_WIDGET(ldd->payGncFreq) );
-        g_signal_connect (ldd->payGncFreq, "changed",
-                          G_CALLBACK (loan_pay_page_valid_cb), ldd);
+            g_signal_handlers_disconnect_by_func( ldd->payGncFreq, loan_pay_page_valid_cb, ldd );
+            gtk_container_remove( GTK_CONTAINER(ldd->payFreqAlign), GTK_WIDGET(ldd->payGncFreq) );
+            ldd->payGncFreq = NULL;
+            ldd->payGncFreq = GNC_FREQUENCY(gnc_frequency_new_from_recurrence( rod->schedule, rod->startDate ));
+            gtk_container_add( GTK_CONTAINER(ldd->payFreqAlign), GTK_WIDGET(ldd->payGncFreq) );
+            g_signal_connect (ldd->payGncFreq, "changed",
+                              G_CALLBACK (loan_pay_page_valid_cb), ldd);
         }
         g_string_free( str, TRUE );
-	loan_pay_page_valid_cb(GTK_WIDGET(ldd->window), ldd);
+        loan_pay_page_valid_cb(GTK_WIDGET(ldd->window), ldd);
     }
 }
 
@@ -1512,14 +1512,14 @@
 void
 loan_pay_page_valid_cb (GtkWidget *widget, gpointer user_data )
 {
-   LoanAssistantData *ldd = user_data;
-   GtkAssistant *assistant = GTK_ASSISTANT(ldd->window);
-   gint num = gtk_assistant_get_current_page (assistant);
-   GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
+    LoanAssistantData *ldd = user_data;
+    GtkAssistant *assistant = GTK_ASSISTANT(ldd->window);
+    gint num = gtk_assistant_get_current_page (assistant);
+    GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
 
-   gtk_assistant_set_page_complete (assistant, page,
-	( loan_pay_complete (assistant, ldd) && 
-       loan_pay_all_opt_valid (assistant, ldd )));
+    gtk_assistant_set_page_complete (assistant, page,
+                                     ( loan_pay_complete (assistant, ldd) &&
+                                       loan_pay_all_opt_valid (assistant, ldd )));
 }
 
 
@@ -1624,13 +1624,13 @@
     {
         if (rod->schedule)
         {
-           recurrenceListFree(&rod->schedule);
+            recurrenceListFree(&rod->schedule);
         }
         if ( rod->startDate )
         {
             g_date_free( rod->startDate );
             rod->startDate = NULL;
-	}
+        }
     }
 }
 
@@ -1694,15 +1694,15 @@
 
     /* Go through all option pages checking for valid enabled pages */
     for ( i = 0; (i < ldd->ld.repayOptCount); i++ )
+    {
+        if (ldd->ld.repayOpts[i]->enabled)
         {
-            if (ldd->ld.repayOpts[i]->enabled)
-		{
-  		    if (ldd->ld.repayOpts[i]->optValid)	
-	                all_valid = TRUE;
-	            else
-		        all_valid = FALSE;
-		}
+            if (ldd->ld.repayOpts[i]->optValid)
+                all_valid = TRUE;
+            else
+                all_valid = FALSE;
         }
+    }
     return all_valid;
 }
 
@@ -1751,10 +1751,10 @@
         return FALSE;
 
     /* Set Page Valid */
-    rod->optValid = TRUE; 
+    rod->optValid = TRUE;
 
     /* If Uniq Freq, then save to recurrence */
-    if ( rod->FreqUniq ) 
+    if ( rod->FreqUniq )
     {
         if ( rod->startDate == NULL )
         {
@@ -1763,10 +1763,10 @@
         recurrenceListFree(&rod->schedule);
         gnc_frequency_save_to_recurrence(ldd->payGncFreq, &rod->schedule, rod->startDate);
 
-	if(! rod->schedule )
-	{
-	    return FALSE;
-	}
+        if (! rod->schedule )
+        {
+            return FALSE;
+        }
     }
     return TRUE;
 }
@@ -1785,11 +1785,11 @@
     GtkTreeViewColumn *column;
     GType *types;
     int i;
-    int col=1;
+    int col = 1;
 
     /* Make sure we saved last Payment Option */
     if (ldd->currentIdx != -1)
-	loan_pay_complete(assistant, ldd);
+        loan_pay_complete(assistant, ldd);
 
     /* Cleanup old view */
     if ( ldd->revView != NULL )
@@ -1861,7 +1861,7 @@
                       "text", LOAN_COL_INTEREST + col,
                       NULL);
             gtk_tree_view_append_column(ldd->revView, column);
-	    col++;
+            col++;
         }
     }
 
@@ -2566,7 +2566,7 @@
 static
 gint
 loan_find_ttsplit_with_acct( gconstpointer elt,
-                           gconstpointer crit )
+                             gconstpointer crit )
 {
     TTSplitInfo *ttsi = (TTSplitInfo*)elt;
     return ( (gnc_ttsplitinfo_get_account( ttsi )
@@ -3123,48 +3123,48 @@
 void
 loan_assistant_cancel( GtkAssistant *gtkassistant, gpointer user_data )
 {
-	LoanAssistantData *ldd = user_data;
-        gnc_close_gui_component_by_data( DIALOG_LOAN_ASSISTANT_CM_CLASS,ldd );
+    LoanAssistantData *ldd = user_data;
+    gnc_close_gui_component_by_data( DIALOG_LOAN_ASSISTANT_CM_CLASS, ldd );
 }
 
 
 void
 loan_assistant_close( GtkAssistant *gtkassistant, gpointer user_data )
 {
-	LoanAssistantData *ldd = user_data;
-        gnc_close_gui_component_by_data( DIALOG_LOAN_ASSISTANT_CM_CLASS,ldd );
+    LoanAssistantData *ldd = user_data;
+    gnc_close_gui_component_by_data( DIALOG_LOAN_ASSISTANT_CM_CLASS, ldd );
 }
 
 
 void
 loan_assistant_prepare (GtkAssistant  *assistant, GtkWidget *page,
-        gpointer user_data)
+                        gpointer user_data)
 {
     LoanAssistantData *ldd = user_data;
     gint currentpage = gtk_assistant_get_current_page(assistant);
 
     switch (currentpage)
     {
-        case 1:
-            /* Current page is info page */
-            loan_info_prep (assistant, user_data);
-            break;
-        case 2:
-            /* Current page is Options page */
-            loan_opt_prep (assistant, user_data);
-            break;
-        case 3:
-            /* Current page is Repayments page */
-            loan_rep_prep (assistant, user_data);
-            break;
-        case 4:
-            /* Current page is Repayments Options page */
-            loan_pay_prep (assistant, user_data);
-            break;
-        case 5:
-            /* Current page is Review page */
-            loan_rev_prep (assistant, user_data);
-            break;
+    case 1:
+        /* Current page is info page */
+        loan_info_prep (assistant, user_data);
+        break;
+    case 2:
+        /* Current page is Options page */
+        loan_opt_prep (assistant, user_data);
+        break;
+    case 3:
+        /* Current page is Repayments page */
+        loan_rep_prep (assistant, user_data);
+        break;
+    case 4:
+        /* Current page is Repayments Options page */
+        loan_pay_prep (assistant, user_data);
+        break;
+    case 5:
+        /* Current page is Review page */
+        loan_rev_prep (assistant, user_data);
+        break;
     }
 }
 

Modified: gnucash/trunk/src/gnome/assistant-stock-split.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-stock-split.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome/assistant-stock-split.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -191,7 +191,7 @@
 
 static void
 selection_changed_cb (GtkTreeSelection *selection,
-                   gpointer user_data)
+                      gpointer user_data)
 {
     StockSplitInfo *info = user_data;
     GtkTreeModel *list;
@@ -250,28 +250,28 @@
 
 
 void gnc_stock_split_assistant_prepare (GtkAssistant  *assistant, GtkWidget *page,
-        gpointer user_data)
+                                        gpointer user_data)
 {
     StockSplitInfo *info = user_data;
     gint currentpage = gtk_assistant_get_current_page(assistant);
 
     switch (currentpage)
     {
-        case 2:
-            /* Current page is details page */
-             gnc_stock_split_assistant_details_prepare(assistant, user_data);
-            break;
-        case 3:
-            /* Current page is Cash in Lieu page */
-             gnc_stock_split_assistant_cash_prepare (assistant, user_data);
-            break;
+    case 2:
+        /* Current page is details page */
+        gnc_stock_split_assistant_details_prepare(assistant, user_data);
+        break;
+    case 3:
+        /* Current page is Cash in Lieu page */
+        gnc_stock_split_assistant_cash_prepare (assistant, user_data);
+        break;
     }
 }
 
 
 void
 gnc_stock_split_assistant_details_prepare (GtkAssistant *assistant,
-                                       gpointer user_data)
+        gpointer user_data)
 {
     StockSplitInfo *info = user_data;
 
@@ -286,7 +286,7 @@
 
 void
 gnc_stock_split_assistant_cash_prepare (GtkAssistant *assistant,
-                                    gpointer user_data)
+                                        gpointer user_data)
 {
     StockSplitInfo *info = user_data;
     GtkTreeSelection *selection;
@@ -300,7 +300,7 @@
 
 gboolean
 gnc_stock_split_assistant_details_complete (GtkAssistant *assistant,
-                                            gpointer user_data)
+        gpointer user_data)
 {
     StockSplitInfo *info = user_data;
     gnc_numeric amount;
@@ -327,7 +327,7 @@
 
 gboolean
 gnc_stock_split_assistant_cash_complete (GtkAssistant *assistant,
-                                         gpointer user_data)
+        gpointer user_data)
 {
     StockSplitInfo *info = user_data;
     gnc_numeric amount;
@@ -357,7 +357,7 @@
 
 void
 gnc_stock_split_assistant_finish (GtkAssistant *assistant,
-                              gpointer user_data)
+                                  gpointer user_data)
 {
     StockSplitInfo *info = user_data;
     GList *account_commits;
@@ -531,26 +531,26 @@
 static void
 gnc_stock_split_details_valid_cb (GtkWidget *widget, gpointer user_data)
 {
-   StockSplitInfo *info = user_data;
-   GtkAssistant *assistant = GTK_ASSISTANT(info->window);
-   gint num = gtk_assistant_get_current_page (assistant);
-   GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
+    StockSplitInfo *info = user_data;
+    GtkAssistant *assistant = GTK_ASSISTANT(info->window);
+    gint num = gtk_assistant_get_current_page (assistant);
+    GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
 
-   gtk_assistant_set_page_complete (assistant, page,
-       gnc_stock_split_assistant_details_complete (assistant, user_data));
+    gtk_assistant_set_page_complete (assistant, page,
+                                     gnc_stock_split_assistant_details_complete (assistant, user_data));
 }
 
 
 static void
 gnc_stock_split_cash_valid_cb (GtkWidget *widget, gpointer user_data)
 {
-   StockSplitInfo *info = user_data;
-   GtkAssistant *assistant = GTK_ASSISTANT(info->window);
-   gint num = gtk_assistant_get_current_page (assistant);
-   GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
+    StockSplitInfo *info = user_data;
+    GtkAssistant *assistant = GTK_ASSISTANT(info->window);
+    gint num = gtk_assistant_get_current_page (assistant);
+    GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
 
-   gtk_assistant_set_page_complete (assistant, page,
-       gnc_stock_split_assistant_cash_complete (assistant, user_data));
+    gtk_assistant_set_page_complete (assistant, page,
+                                     gnc_stock_split_assistant_cash_complete (assistant, user_data));
 }
 
 
@@ -561,7 +561,7 @@
     GtkWidget *window;
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file  (builder ,"assistant-stock-split.glade", "Stock Split Assistant");
+    gnc_builder_add_from_file  (builder , "assistant-stock-split.glade", "Stock Split Assistant");
     window = GTK_WIDGET(gtk_builder_get_object (builder, "Stock Split Assistant"));
     info->window = window;
 

Modified: gnucash/trunk/src/gnome/dialog-lot-viewer.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-lot-viewer.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome/dialog-lot-viewer.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -755,8 +755,8 @@
 
     lv->window = GTK_WIDGET(gtk_builder_get_object (builder, "Lot Viewer Window"));
 
-    win_title=g_strdup_printf (_("Lots in Account %s"),
-                               xaccAccountGetName(lv->account));
+    win_title = g_strdup_printf (_("Lots in Account %s"),
+                                 xaccAccountGetName(lv->account));
     gtk_window_set_title (GTK_WINDOW (lv->window), win_title);
     g_free (win_title);
 

Modified: gnucash/trunk/src/gnome/dialog-price-editor.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-price-editor.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome/dialog-price-editor.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -411,19 +411,19 @@
 
     /* namespace List Store - create here as we get an error if created in builder */
     {
-    GtkListStore  *store;
-    GtkTreeIter    iter;
-    gchar          string[] = "Dummy namespace Line";
+        GtkListStore  *store;
+        GtkTreeIter    iter;
+        gchar          string[] = "Dummy namespace Line";
 
-    store = gtk_list_store_new( 1, G_TYPE_STRING );
+        store = gtk_list_store_new( 1, G_TYPE_STRING );
 
-    gtk_list_store_append( store, &iter );
-    gtk_list_store_set( store, &iter, 0, string, -1 );
+        gtk_list_store_append( store, &iter );
+        gtk_list_store_set( store, &iter, 0, string, -1 );
 
-    gtk_combo_box_set_model( GTK_COMBO_BOX( pedit_dialog->namespace_cbe ),
-                         GTK_TREE_MODEL( store ) );
-    g_object_unref( G_OBJECT( store ) );
-    gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY( pedit_dialog->namespace_cbe ), 0 );
+        gtk_combo_box_set_model( GTK_COMBO_BOX( pedit_dialog->namespace_cbe ),
+                                 GTK_TREE_MODEL( store ) );
+        g_object_unref( G_OBJECT( store ) );
+        gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY( pedit_dialog->namespace_cbe ), 0 );
     }
 
     gtk_combo_box_remove_text(GTK_COMBO_BOX(pedit_dialog->namespace_cbe), 0);
@@ -436,19 +436,19 @@
 
     /* commodity List Store - create here as we get an error if created in builder */
     {
-    GtkListStore  *store;
-    GtkTreeIter    iter;
-    gchar          string[] = "Dummy commodity Line";
+        GtkListStore  *store;
+        GtkTreeIter    iter;
+        gchar          string[] = "Dummy commodity Line";
 
-    store = gtk_list_store_new( 1, G_TYPE_STRING );
+        store = gtk_list_store_new( 1, G_TYPE_STRING );
 
-    gtk_list_store_append( store, &iter );
-    gtk_list_store_set( store, &iter, 0, string, -1 );
+        gtk_list_store_append( store, &iter );
+        gtk_list_store_set( store, &iter, 0, string, -1 );
 
-    gtk_combo_box_set_model( GTK_COMBO_BOX( pedit_dialog->commodity_cbe ),
-                         GTK_TREE_MODEL( store ) );
-    g_object_unref( G_OBJECT( store ) );
-    gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY( pedit_dialog->commodity_cbe ), 0 );
+        gtk_combo_box_set_model( GTK_COMBO_BOX( pedit_dialog->commodity_cbe ),
+                                 GTK_TREE_MODEL( store ) );
+        g_object_unref( G_OBJECT( store ) );
+        gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY( pedit_dialog->commodity_cbe ), 0 );
     }
 
     gtk_combo_box_remove_text(GTK_COMBO_BOX(pedit_dialog->commodity_cbe), 0);

Modified: gnucash/trunk/src/gnome/dialog-print-check.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome/dialog-print-check.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -2114,7 +2114,7 @@
 
 
 /* Print each of the items that in the description of a single check.  This
- * function uses helper functions to print text based and picture based items. 
+ * function uses helper functions to print text based and picture based items.
  */
 static void
 draw_page_items(GncPrintContext *context,
@@ -2237,7 +2237,7 @@
 }
 
 
-/* Print each of the items that in the description of a single check.  This 
+/* Print each of the items that in the description of a single check.  This
  * function uses helper functions to print text based and picture based items.
  */
 static void
@@ -2262,7 +2262,7 @@
 }
 
 
-/* Print an entire page based upon the layout in a check description file. This 
+/* Print an entire page based upon the layout in a check description file. This
  * function takes care of translating/rotating the page, calling the function to
  * print the grid pattern (if requested), and calls a helper function to print
  * all check items.

Modified: gnucash/trunk/src/gnome/dialog-tax-info.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-tax-info.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome/dialog-tax-info.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -301,7 +301,7 @@
             str = g_strdup ("");
         if (safe_strcmp (str, "not-impl") == 0)
         {
-            g_free (str); 
+            g_free (str);
             continue;
         }
 
@@ -332,39 +332,39 @@
         g_free (str);
 
         scm = scm_call_3 (getters.form, category, code_scm, tax_entity_type);
-        if (scm_is_string(scm)) 
-        { 
-            scm_dynwind_begin (0); 
-            str = scm_to_locale_string(scm); 
-            txf_info->form = g_strdup (str); 
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
-        } 
-        else 
-            txf_info->form = g_strdup (""); 
+        if (scm_is_string(scm))
+        {
+            scm_dynwind_begin (0);
+            str = scm_to_locale_string(scm);
+            txf_info->form = g_strdup (str);
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
+        }
+        else
+            txf_info->form = g_strdup ("");
 
         scm = scm_call_3 (getters.description, category, code_scm, tax_entity_type);
-        if (scm_is_string(scm)) 
-        { 
-            scm_dynwind_begin (0); 
-            str = scm_to_locale_string(scm); 
-            txf_info->description = g_strdup (str); 
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
-        } 
-        else 
-            txf_info->description = g_strdup (""); 
+        if (scm_is_string(scm))
+        {
+            scm_dynwind_begin (0);
+            str = scm_to_locale_string(scm);
+            txf_info->description = g_strdup (str);
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
+        }
+        else
+            txf_info->description = g_strdup ("");
 
         scm = scm_call_2 (getters.help, category, code_scm);
-        if (scm_is_string(scm)) 
-        { 
-            scm_dynwind_begin (0); 
-            str = scm_to_locale_string(scm); 
-            help_text = g_strdup (str); 
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
-        } 
-        else 
+        if (scm_is_string(scm))
+        {
+            scm_dynwind_begin (0);
+            str = scm_to_locale_string(scm);
+            help_text = g_strdup (str);
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
+        }
+        else
             help_text = g_strdup ("");
 
         scm = scm_call_3 (getters.last_year, category, code_scm, tax_entity_type);
@@ -389,23 +389,23 @@
                 scm       = SCM_CDR (scm);
 
                 line_year = scm_is_bool (SCM_CAR (year_scm)) ? 0 :
-                                          scm_to_int (SCM_CAR (year_scm));
-                if (scm_is_string((SCM_CAR (SCM_CDR (year_scm))))) 
-                { 
-                    gchar *temp_line; 
-                    scm_dynwind_begin (0); 
-                    temp_line = scm_to_locale_string((SCM_CAR (SCM_CDR 
-                                                      (year_scm)))); 
-                    line = g_strdup (temp_line); 
-                    scm_dynwind_free (temp_line); 
-                    scm_dynwind_end (); 
-                } 
-                else 
-                    line = g_strdup (""); 
-                temp2 = g_strdup_printf ("%d", line_year); 
-                temp = g_strconcat (form_line_data, "\n", temp2, " - ", 
-                                    until, "   ", line, NULL); 
-                if (until != now) 
+                            scm_to_int (SCM_CAR (year_scm));
+                if (scm_is_string((SCM_CAR (SCM_CDR (year_scm)))))
+                {
+                    gchar *temp_line;
+                    scm_dynwind_begin (0);
+                    temp_line = scm_to_locale_string((SCM_CAR (SCM_CDR
+                                                      (year_scm))));
+                    line = g_strdup (temp_line);
+                    scm_dynwind_free (temp_line);
+                    scm_dynwind_end ();
+                }
+                else
+                    line = g_strdup ("");
+                temp2 = g_strdup_printf ("%d", line_year);
+                temp = g_strconcat (form_line_data, "\n", temp2, " - ",
+                                    until, "   ", line, NULL);
+                if (until != now)
                     g_free (until);
                 until = g_strdup_printf ("%d", (line_year - 1));
                 g_free (form_line_data);
@@ -414,7 +414,7 @@
                 g_free (temp);
                 g_free (temp2);
             }
-            if (safe_strcmp (until, now) != 0) 
+            if (safe_strcmp (until, now) != 0)
                 g_free (until);
         }
         if (year != 0)
@@ -451,7 +451,7 @@
         g_free (form_line_data);
 
         scm = scm_call_3 (getters.copy, category, code_scm, tax_entity_type);
-        cpy = scm_is_bool (scm) ? (scm_is_false (scm) ? FALSE : TRUE): FALSE;
+        cpy = scm_is_bool (scm) ? (scm_is_false (scm) ? FALSE : TRUE) : FALSE;
         txf_info->copy = cpy;
 
         infos = g_list_prepend (infos, txf_info);
@@ -509,30 +509,30 @@
         g_free (str);
 
         scm = scm_call_1 (getters.tax_entity_type, type_scm);
-        if (scm_is_string(scm)) 
-        { 
-            scm_dynwind_begin (0); 
-            str = scm_to_locale_string(scm); 
-            tax_type_info->type = g_strdup (str); 
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
-        } 
-        else 
+        if (scm_is_string(scm))
+        {
+            scm_dynwind_begin (0);
+            str = scm_to_locale_string(scm);
+            tax_type_info->type = g_strdup (str);
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
+        }
+        else
             tax_type_info->type = g_strdup ("");
 
         scm = scm_call_1 (getters.tax_entity_desc, type_scm);
-        if (scm_is_string(scm)) 
-        { 
-            scm_dynwind_begin (0); 
-            str = scm_to_locale_string(scm); 
-            tax_type_info->description = g_strdup (str); 
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
-        } 
-        else 
-            tax_type_info->description = g_strdup (""); 
- 
-        tax_type_info->combo_box_entry = g_strconcat(tax_type_info->type, 
+        if (scm_is_string(scm))
+        {
+            scm_dynwind_begin (0);
+            str = scm_to_locale_string(scm);
+            tax_type_info->description = g_strdup (str);
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
+        }
+        else
+            tax_type_info->description = g_strdup ("");
+
+        tax_type_info->combo_box_entry = g_strconcat(tax_type_info->type,
                                          " - ",
                                          tax_type_info->description, NULL);
         /* save combo text for current tax type code */
@@ -1428,7 +1428,7 @@
     /* account tree */
     {
         GtkWidget *income_radio, *expense_radio, *asset_radio,
-                    *liab_eq_radio, *box;
+                  *liab_eq_radio, *box;
 
         ti_dialog->acct_info = glade_xml_get_widget (xml, "acct_info_vbox");
         box = glade_xml_get_widget (xml, "account_scroll");

Modified: gnucash/trunk/src/gnome/gnc-plugin-page-budget.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-budget.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-budget.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -738,7 +738,7 @@
 }
 
 
-/********************* 
+/*********************
  * Command callbacks *
  ********************/
 static void
@@ -834,69 +834,69 @@
 
     if (!priv->dialog)
     {
-    builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "gnc-plugin-page-budget.glade", "NumPeriods_Adj");
-    gnc_builder_add_from_file (builder, "gnc-plugin-page-budget.glade", "OptionsContainer");
+        builder = gtk_builder_new();
+        gnc_builder_add_from_file (builder, "gnc-plugin-page-budget.glade", "NumPeriods_Adj");
+        gnc_builder_add_from_file (builder, "gnc-plugin-page-budget.glade", "OptionsContainer");
 
-    priv->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "OptionsContainer"));
+        priv->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "OptionsContainer"));
 
-    gtk_window_set_transient_for(
-        GTK_WINDOW(priv->dialog),
-        GTK_WINDOW(gnc_plugin_page_get_window(GNC_PLUGIN_PAGE(page))));
+        gtk_window_set_transient_for(
+            GTK_WINDOW(priv->dialog),
+            GTK_WINDOW(gnc_plugin_page_get_window(GNC_PLUGIN_PAGE(page))));
 
-    gbname = GTK_WIDGET(gtk_builder_get_object (builder, "BudgetName"));
-    gtk_entry_set_text(GTK_ENTRY(gbname), gnc_budget_get_name(priv->budget));
+        gbname = GTK_WIDGET(gtk_builder_get_object (builder, "BudgetName"));
+        gtk_entry_set_text(GTK_ENTRY(gbname), gnc_budget_get_name(priv->budget));
 
-    gbtreeview = GTK_WIDGET(gtk_builder_get_object (builder, "BudgetDescription"));
-    buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gbtreeview));
-    gtk_text_buffer_set_text (buffer, gnc_budget_get_description(priv->budget), -1);
+        gbtreeview = GTK_WIDGET(gtk_builder_get_object (builder, "BudgetDescription"));
+        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gbtreeview));
+        gtk_text_buffer_set_text (buffer, gnc_budget_get_description(priv->budget), -1);
 
-    gbhb = GTK_WIDGET(gtk_builder_get_object (builder, "BudgetPeriod"));
-    gr = GNC_RECURRENCE(gnc_recurrence_new());
-    gnc_recurrence_set(gr, gnc_budget_get_recurrence(priv->budget));
-    gtk_box_pack_start (GTK_BOX (gbhb), GTK_WIDGET(gr), TRUE, TRUE, 0);
-    gtk_widget_show (GTK_WIDGET(gr));
+        gbhb = GTK_WIDGET(gtk_builder_get_object (builder, "BudgetPeriod"));
+        gr = GNC_RECURRENCE(gnc_recurrence_new());
+        gnc_recurrence_set(gr, gnc_budget_get_recurrence(priv->budget));
+        gtk_box_pack_start (GTK_BOX (gbhb), GTK_WIDGET(gr), TRUE, TRUE, 0);
+        gtk_widget_show (GTK_WIDGET(gr));
 
-    gbnumperiods = GTK_WIDGET(gtk_builder_get_object (builder, "BudgetNumPeriods"));
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(gbnumperiods), gnc_budget_get_num_periods(priv->budget));
+        gbnumperiods = GTK_WIDGET(gtk_builder_get_object (builder, "BudgetNumPeriods"));
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(gbnumperiods), gnc_budget_get_num_periods(priv->budget));
 
-    gtk_widget_show_all (priv->dialog);
-    result = gtk_dialog_run(GTK_DIALOG(priv->dialog));
+        gtk_widget_show_all (priv->dialog);
+        result = gtk_dialog_run(GTK_DIALOG(priv->dialog));
 
-    switch (result)
-    {
-    case GTK_RESPONSE_OK:
-	name = (gchar *) gtk_entry_get_text(GTK_ENTRY(gbname));
-   	DEBUG("%s", name);
-    	if (name)
-    	{
-            gchar* label;
-            gnc_budget_set_name(priv->budget, name); 
-            label = g_strdup_printf("%s: %s", _("Budget"), name);
-            main_window_update_page_name(GNC_PLUGIN_PAGE(page), label);
-            g_free(label);
-        }
+        switch (result)
+        {
+        case GTK_RESPONSE_OK:
+            name = (gchar *) gtk_entry_get_text(GTK_ENTRY(gbname));
+            DEBUG("%s", name);
+            if (name)
+            {
+                gchar* label;
+                gnc_budget_set_name(priv->budget, name);
+                label = g_strdup_printf("%s: %s", _("Budget"), name);
+                main_window_update_page_name(GNC_PLUGIN_PAGE(page), label);
+                g_free(label);
+            }
 
-        gtk_text_buffer_get_bounds (gtk_text_view_get_buffer(GTK_TEXT_VIEW (gbtreeview)), &start, &end);
-        desc = gtk_text_buffer_get_text (gtk_text_view_get_buffer(GTK_TEXT_VIEW (gbtreeview)), &start, &end, TRUE);
+            gtk_text_buffer_get_bounds (gtk_text_view_get_buffer(GTK_TEXT_VIEW (gbtreeview)), &start, &end);
+            desc = gtk_text_buffer_get_text (gtk_text_view_get_buffer(GTK_TEXT_VIEW (gbtreeview)), &start, &end, TRUE);
 
-        gnc_budget_set_description(priv->budget, desc);
-        g_free(desc);
+            gnc_budget_set_description(priv->budget, desc);
+            g_free(desc);
 
-        num_periods = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(gbnumperiods));
-        gnc_budget_set_num_periods(priv->budget, num_periods);
+            num_periods = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(gbnumperiods));
+            gnc_budget_set_num_periods(priv->budget, num_periods);
 
-        r = gnc_recurrence_get(gr);
-        gnc_budget_set_recurrence(priv->budget, r);
-        break;
-    case GTK_RESPONSE_CANCEL:
-	break;
-    default:
-        break;
+            r = gnc_recurrence_get(gr);
+            gnc_budget_set_recurrence(priv->budget, r);
+            break;
+        case GTK_RESPONSE_CANCEL:
+            break;
+        default:
+            break;
+        }
+        g_object_unref(G_OBJECT(builder));
+        gtk_widget_destroy(priv->dialog);
     }
-    g_object_unref(G_OBJECT(builder));
-    gtk_widget_destroy(priv->dialog);
-    }
     priv->dialog = NULL;
 }
 

Modified: gnucash/trunk/src/gnome/window-autoclear.c
===================================================================
--- gnucash/trunk/src/gnome/window-autoclear.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome/window-autoclear.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -232,8 +232,8 @@
                 toclear_value = gnc_numeric_sub_fixed(toclear_value,
                                                       xaccSplitGetAmount(split));
                 PINFO("    Cleared: %s -> %s\n",
-                       gnc_numeric_to_string(xaccSplitGetAmount(split)),
-                       gnc_numeric_to_string(toclear_value));
+                      gnc_numeric_to_string(xaccSplitGetAmount(split)),
+                      gnc_numeric_to_string(toclear_value));
             }
             else
             {

Modified: gnucash/trunk/src/gnome-search/dialog-search.c
===================================================================
--- gnucash/trunk/src/gnome-search/dialog-search.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-search/dialog-search.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -959,23 +959,23 @@
 
     /* if there's no original query, make the narrow, add, delete buttons inaccessible */
     sw->new_rb = GTK_WIDGET(gtk_builder_get_object (builder, "new_search_radiobutton"));
-    g_signal_connect (sw->new_rb,"toggled",
-                                   G_CALLBACK (search_type_cb), sw);
+    g_signal_connect (sw->new_rb, "toggled",
+                      G_CALLBACK (search_type_cb), sw);
     sw->narrow_rb = GTK_WIDGET(gtk_builder_get_object (builder, "narrow_search_radiobutton"));
-    g_signal_connect (sw->narrow_rb,"toggled",
-                                   G_CALLBACK (search_type_cb), sw);
+    g_signal_connect (sw->narrow_rb, "toggled",
+                      G_CALLBACK (search_type_cb), sw);
     sw->add_rb = GTK_WIDGET(gtk_builder_get_object (builder, "add_search_radiobutton"));
-    g_signal_connect (sw->add_rb,"toggled",
-                                   G_CALLBACK (search_type_cb), sw);
+    g_signal_connect (sw->add_rb, "toggled",
+                      G_CALLBACK (search_type_cb), sw);
     sw->del_rb = GTK_WIDGET(gtk_builder_get_object (builder, "delete_search_radiobutton"));
-    g_signal_connect (sw->del_rb,"toggled",
-                                   G_CALLBACK (search_type_cb), sw);
+    g_signal_connect (sw->del_rb, "toggled",
+                      G_CALLBACK (search_type_cb), sw);
 
     active = gnc_gconf_get_bool(sw->gconf_section, KEY_ACTIVE_ONLY, NULL);
     sw->active_only_check = GTK_WIDGET(gtk_builder_get_object (builder, "active_only_check"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sw->active_only_check), active);
-    g_signal_connect (sw->active_only_check,"toggled",
-                                   G_CALLBACK (search_active_only_cb), sw);
+    g_signal_connect (sw->active_only_check, "toggled",
+                      G_CALLBACK (search_active_only_cb), sw);
 
 
     /* Figure out if we this object-type has an "active" parameter, and
@@ -986,30 +986,30 @@
 
     /* Deal with the find button */
     widget = GTK_WIDGET(gtk_builder_get_object (builder, "find_button"));
-    g_signal_connect (widget,"clicked",
-                                   G_CALLBACK (search_find_cb), sw);
+    g_signal_connect (widget, "clicked",
+                      G_CALLBACK (search_find_cb), sw);
 
     /* Deal with the cancel button */
     sw->cancel_button = GTK_WIDGET(gtk_builder_get_object (builder, "cancel_button"));
-    g_signal_connect (sw->cancel_button,"clicked",
-                                   G_CALLBACK (search_cancel_cb), sw);
+    g_signal_connect (sw->cancel_button, "clicked",
+                      G_CALLBACK (search_cancel_cb), sw);
 
     /* Deal with the close button */
     sw->close_button = GTK_WIDGET(gtk_builder_get_object (builder, "close_button"));
-    g_signal_connect (sw->close_button,"clicked",
-                                   G_CALLBACK (search_cancel_cb), sw);
+    g_signal_connect (sw->close_button, "clicked",
+                      G_CALLBACK (search_cancel_cb), sw);
 
     /* Deal with the new_item button */
     new_item_button = GTK_WIDGET(gtk_builder_get_object (builder, "new_item_button"));
     gtk_button_set_label (GTK_BUTTON(new_item_button),
                           type_label_to_new_button(type_label));
-    g_signal_connect (new_item_button,"clicked",
-                                   G_CALLBACK (search_new_item_cb), sw);
+    g_signal_connect (new_item_button, "clicked",
+                      G_CALLBACK (search_new_item_cb), sw);
 
     /* Deal with the help button */
     widget = GTK_WIDGET(gtk_builder_get_object (builder, "help_button"));
-    g_signal_connect (widget,"clicked",
-                                   G_CALLBACK (search_help_cb), sw);
+    g_signal_connect (widget, "clicked",
+                      G_CALLBACK (search_help_cb), sw);
 
     /* add the first criterion */
     gnc_search_dialog_add_criterion (sw);

Modified: gnucash/trunk/src/gnome-utils/assistant-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/assistant-utils.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/assistant-utils.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -34,8 +34,8 @@
 
 void
 gnc_assistant_set_watermark_images (GtkAssistant *assistant,
-                                const char *top_path,
-                                const char *side_path)
+                                    const char *top_path,
+                                    const char *side_path)
 {
     GdkPixbuf     *top_pixbuf, *side_pixbuf;
     GList         *page_list, *item;
@@ -53,8 +53,8 @@
 
         gtk_assistant_set_page_header_image (assistant, page, top_pixbuf);
         if ( (page_type == GTK_ASSISTANT_PAGE_INTRO) ||
-             (page_type == GTK_ASSISTANT_PAGE_SUMMARY) ||
-             (page_type == GTK_ASSISTANT_PAGE_CONFIRM) )
+                (page_type == GTK_ASSISTANT_PAGE_SUMMARY) ||
+                (page_type == GTK_ASSISTANT_PAGE_CONFIRM) )
             gtk_assistant_set_page_side_image (assistant, page, side_pixbuf);
     }
 

Modified: gnucash/trunk/src/gnome-utils/assistant-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/assistant-utils.h	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/assistant-utils.h	2011-08-22 07:10:56 UTC (rev 21205)
@@ -28,8 +28,8 @@
 #include <gtk/gtk.h>
 
 void gnc_assistant_set_watermark_images (GtkAssistant *assistant,
-                                     const char *top_path,
-                                     const char *side_path);
+        const char *top_path,
+        const char *side_path);
 void gnc_assistant_set_colors (GtkAssistant *assistant);
 
 #endif

Modified: gnucash/trunk/src/gnome-utils/dialog-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-account.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/dialog-account.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -151,10 +151,10 @@
 void gnc_account_name_changed_cb(GtkWidget *widget, gpointer data);
 void gnc_account_color_default_cb(GtkWidget *widget, gpointer data);
 void gnc_account_name_insert_text_cb (GtkWidget   *entry,
-                                                      const gchar *text,
-                                                      gint         length,
-                                                      gint        *position,
-                                                      gpointer     data);
+                                      const gchar *text,
+                                      gint         length,
+                                      gint        *position,
+                                      gpointer     data);
 
 /** Implementation *******************************************************/
 
@@ -421,17 +421,17 @@
     flag =
         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (aw->tax_related_button));
     if (xaccAccountGetTaxRelated (account) != flag)
-	xaccAccountSetTaxRelated (account, flag);
+        xaccAccountSetTaxRelated (account, flag);
 
     flag =
         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (aw->placeholder_button));
     if (xaccAccountGetPlaceholder (account) != flag)
-	xaccAccountSetPlaceholder (account, flag);
+        xaccAccountSetPlaceholder (account, flag);
 
     flag =
         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (aw->hidden_button));
     if (xaccAccountGetHidden (account) != flag)
-	xaccAccountSetHidden (account, flag);
+        xaccAccountSetHidden (account, flag);
 
     parent_account = gnc_tree_view_account_get_selected_account (GNC_TREE_VIEW_ACCOUNT (aw->parent_tree));
 
@@ -1382,7 +1382,7 @@
         gtk_notebook_get_nth_page (GTK_NOTEBOOK (aw->notebook), 1);
 
     aw->opening_equity_radio = GTK_WIDGET(gtk_builder_get_object (builder,
-                               "opening_equity_radio"));
+                                          "opening_equity_radio"));
 
     box = GTK_WIDGET(gtk_builder_get_object (builder, "transfer_account_scroll"));
     aw->transfer_account_scroll = box;

Modified: gnucash/trunk/src/gnome-utils/dialog-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-commodity.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/dialog-commodity.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -249,7 +249,7 @@
     GtkWidget *button, *label;
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder,"dialog-commodity.glade", "Security Selector Dialog");
+    gnc_builder_add_from_file (builder, "dialog-commodity.glade", "Security Selector Dialog");
 
     gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, retval);
 
@@ -262,36 +262,36 @@
 
     /* namespace List Store - create here as we get an error if created in builder */
     {
-    GtkListStore  *store;
-    GtkTreeIter    iter;
-    gchar          string[] = "Dummy namespace Line";
+        GtkListStore  *store;
+        GtkTreeIter    iter;
+        gchar          string[] = "Dummy namespace Line";
 
-    store = gtk_list_store_new( 1, G_TYPE_STRING );
+        store = gtk_list_store_new( 1, G_TYPE_STRING );
 
-    gtk_list_store_append( store, &iter );
-    gtk_list_store_set( store, &iter, 0, string, -1 );
+        gtk_list_store_append( store, &iter );
+        gtk_list_store_set( store, &iter, 0, string, -1 );
 
-    gtk_combo_box_set_model( GTK_COMBO_BOX( retval->namespace_combo ),
-                         GTK_TREE_MODEL( store ) );
-    g_object_unref( G_OBJECT( store ) );
-    gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY( retval->namespace_combo ), 0 );
+        gtk_combo_box_set_model( GTK_COMBO_BOX( retval->namespace_combo ),
+                                 GTK_TREE_MODEL( store ) );
+        g_object_unref( G_OBJECT( store ) );
+        gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY( retval->namespace_combo ), 0 );
     }
 
     /* commodity List Store - create here as we get an error if created in builder */
     {
-    GtkListStore  *store;
-    GtkTreeIter    iter;
-    gchar          string[] = "Dummy commodity Line";
+        GtkListStore  *store;
+        GtkTreeIter    iter;
+        gchar          string[] = "Dummy commodity Line";
 
-    store = gtk_list_store_new( 1, G_TYPE_STRING );
+        store = gtk_list_store_new( 1, G_TYPE_STRING );
 
-    gtk_list_store_append( store, &iter );
-    gtk_list_store_set( store, &iter, 0, string, -1 );
+        gtk_list_store_append( store, &iter );
+        gtk_list_store_set( store, &iter, 0, string, -1 );
 
-    gtk_combo_box_set_model( GTK_COMBO_BOX( retval->commodity_combo ),
-                         GTK_TREE_MODEL( store ) );
-    g_object_unref( G_OBJECT( store ) );
-    gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY( retval->commodity_combo ), 0 );
+        gtk_combo_box_set_model( GTK_COMBO_BOX( retval->commodity_combo ),
+                                 GTK_TREE_MODEL( store ) );
+        g_object_unref( G_OBJECT( store ) );
+        gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY( retval->commodity_combo ), 0 );
     }
 
     gtk_combo_box_remove_text(GTK_COMBO_BOX(retval->namespace_combo), 0);
@@ -496,7 +496,7 @@
 
     /* Erase the entry text */
     entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
-    gtk_editable_delete_text(GTK_EDITABLE(entry),0,-1);
+    gtk_editable_delete_text(GTK_EDITABLE(entry), 0, -1);
 
     gtk_combo_box_set_active(combo_box, -1);
 
@@ -714,8 +714,8 @@
     {
         if (g_utf8_collate(node->data, GNC_COMMODITY_NS_LEGACY) == 0)
             continue;
-	/* Hide the template entry */
-	if (g_utf8_collate(node->data, "template" ) != 0)
+        /* Hide the template entry */
+        if (g_utf8_collate(node->data, "template" ) != 0)
             gtk_combo_box_append_text(combo_box, node->data);
         if (init_string && (g_utf8_collate(node->data, init_string) == 0))
             match = current;
@@ -964,11 +964,11 @@
     gchar *text;
 
     ENTER("widget=%p, selected namespace=%s, fullname=%s, mnemonic=%s",
-		 parent, selected_namespace, fullname, mnemonic);
+          parent, selected_namespace, fullname, mnemonic);
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder,"dialog-commodity.glade", "adjustment1");
-    gnc_builder_add_from_file (builder,"dialog-commodity.glade", "Security Dialog");
+    gnc_builder_add_from_file (builder, "dialog-commodity.glade", "adjustment1");
+    gnc_builder_add_from_file (builder, "dialog-commodity.glade", "Security Dialog");
 
     gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, retval);
 
@@ -1006,19 +1006,19 @@
 
     /* namespace List Store - create here as we get an error if created in builder */
     {
-    GtkListStore  *store;
-    GtkTreeIter    iter;
-    gchar          string[] = "Dummy namespace Line";
+        GtkListStore  *store;
+        GtkTreeIter    iter;
+        gchar          string[] = "Dummy namespace Line";
 
-    store = gtk_list_store_new( 1, G_TYPE_STRING );
+        store = gtk_list_store_new( 1, G_TYPE_STRING );
 
-    gtk_list_store_append( store, &iter );
-    gtk_list_store_set( store, &iter, 0, string, -1 );
+        gtk_list_store_append( store, &iter );
+        gtk_list_store_set( store, &iter, 0, string, -1 );
 
-    gtk_combo_box_set_model( GTK_COMBO_BOX( retval->namespace_combo ),
-                         GTK_TREE_MODEL( store ) );
-    g_object_unref( G_OBJECT( store ) );
-    gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY( retval->namespace_combo ), 0 );
+        gtk_combo_box_set_model( GTK_COMBO_BOX( retval->namespace_combo ),
+                                 GTK_TREE_MODEL( store ) );
+        g_object_unref( G_OBJECT( store ) );
+        gtk_combo_box_entry_set_text_column( GTK_COMBO_BOX_ENTRY( retval->namespace_combo ), 0 );
     }
 
     /* Build custom widgets */
@@ -1243,7 +1243,7 @@
 }
 
 
-/******************************************************** 
+/********************************************************
  * Create and run the new/edit commodity dialog.        *
  ********************************************************/
 gnc_commodity *

Modified: gnucash/trunk/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/dialog-options.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -2253,11 +2253,11 @@
         const gchar *string;
         char * str;
 
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         str = scm_to_locale_string (value);
         string = g_strdup (str);
-        scm_dynwind_free (str); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (str);
+        scm_dynwind_end ();
 
         gtk_entry_set_text(GTK_ENTRY(widget), string);
         g_free ((gpointer *) string);
@@ -2283,11 +2283,11 @@
         const gchar *string;
         char * str;
 
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         str = scm_to_locale_string (value);
         string = g_strdup (str);
-        scm_dynwind_free (str); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (str);
+        scm_dynwind_end ();
 
         gtk_text_buffer_set_text (buffer, string, scm_c_string_length(value));
         g_free ((gpointer *) string);
@@ -2581,11 +2581,11 @@
         const gchar *string;
         char * str;
 
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         str = scm_to_locale_string (value);
         string = g_strdup (str);
-        scm_dynwind_free (str); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (str);
+        scm_dynwind_end ();
 
         if ((string != NULL) && (*string != '\0'))
         {
@@ -2609,11 +2609,11 @@
         const gchar *string;
         char * str;
 
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         str = scm_to_locale_string (value);
         string = g_strdup (str);
-        scm_dynwind_free (str); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (str);
+        scm_dynwind_end ();
 
         if (string && *string)
         {

Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -165,11 +165,11 @@
                                     gint *start_pos,
                                     XferDialog *xferData);
 gboolean gnc_xfer_description_key_press_cb( GtkEntry *entry,
-                                            GdkEventKey *event,
-                                            XferDialog *xferData );
+        GdkEventKey *event,
+        XferDialog *xferData );
 void gnc_xfer_dialog_fetch (GtkButton *button, XferDialog *xferData);
 gboolean gnc_xfer_dialog_show_inc_exp_visible_cb (Account *account,
-                                                  gpointer data);
+        gpointer data);
 void price_amount_radio_toggled_cb(GtkToggleButton *togglebutton, gpointer data);
 
 void gnc_xfer_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data);
@@ -525,20 +525,20 @@
     if (use_accounting_labels)
     {
         button = GTK_WIDGET(gtk_builder_get_object (builder,
-                                          (direction == XFER_DIALOG_TO) ?
-                                          "left_show_button" : "right_show_button"));
+                            (direction == XFER_DIALOG_TO) ?
+                            "left_show_button" : "right_show_button"));
         scroll_win = GTK_WIDGET(gtk_builder_get_object (builder,
-                                              (direction == XFER_DIALOG_TO) ?
-                                              "left_trans_window" : "right_trans_window"));
+                                (direction == XFER_DIALOG_TO) ?
+                                "left_trans_window" : "right_trans_window"));
     }
     else
     {
         button = GTK_WIDGET(gtk_builder_get_object (builder,
-                                          (direction == XFER_DIALOG_TO) ?
-                                          "right_show_button" : "left_show_button"));
+                            (direction == XFER_DIALOG_TO) ?
+                            "right_show_button" : "left_show_button"));
         scroll_win = GTK_WIDGET(gtk_builder_get_object (builder,
-                                              (direction == XFER_DIALOG_TO) ?
-                                              "right_trans_window" : "left_trans_window"));
+                                (direction == XFER_DIALOG_TO) ?
+                                "right_trans_window" : "left_trans_window"));
     }
 
     tree_view = GTK_TREE_VIEW(gnc_tree_view_account_new(FALSE));
@@ -1200,7 +1200,7 @@
     gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (xferData->amount_edit), amount);
 }
 void gnc_xfer_dialog_set_amount_sensitive(XferDialog *xferData,
-                                          gboolean is_sensitive)
+        gboolean is_sensitive)
 {
     g_assert(xferData);
     gtk_widget_set_sensitive(gnc_amount_edit_gtk_entry(GNC_AMOUNT_EDIT (xferData->amount_edit)), is_sensitive);

Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -1005,7 +1005,7 @@
                                  connect_object, flags);
     else
         g_signal_connect_data(signal_object, signal_name, func,
-                              user_data,NULL , flags);
+                              user_data, NULL , flags);
 }
 
 /* End of GtkBuilder utilities */

Modified: gnucash/trunk/src/gnome-utils/gnc-account-sel.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-account-sel.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-account-sel.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -331,7 +331,7 @@
     if ( acct == NULL )
     {
         entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(gas->combo)));
-        gtk_editable_delete_text(GTK_EDITABLE(entry),0,-1);
+        gtk_editable_delete_text(GTK_EDITABLE(entry), 0, -1);
         return;
     }
     data.gas = gas;

Modified: gnucash/trunk/src/gnome-utils/gnc-amount-edit.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-amount-edit.h	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-amount-edit.h	2011-08-22 07:10:56 UTC (rev 21205)
@@ -76,7 +76,7 @@
 double      gnc_amount_edit_get_damount   (GNCAmountEdit *gae);
 
 gint      gnc_amount_edit_expr_is_valid (GNCAmountEdit *gae, gnc_numeric *amount,
-                                         gboolean empty_ok);
+        gboolean empty_ok);
 gboolean  gnc_amount_edit_evaluate        (GNCAmountEdit *gae);
 
 void      gnc_amount_edit_set_print_info  (GNCAmountEdit *gae,

Modified: gnucash/trunk/src/gnome-utils/gnc-date-format.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-format.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-date-format.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -164,8 +164,8 @@
 
     /* Open up the Glade and set the signals */
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder,"gnc-date-format.glade", "format-liststore");
-    gnc_builder_add_from_file (builder,"gnc-date-format.glade", "GNC Date Format");
+    gnc_builder_add_from_file (builder, "gnc-date-format.glade", "format-liststore");
+    gnc_builder_add_from_file (builder, "gnc-date-format.glade", "GNC Date Format");
 
     gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, gdf);
 

Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -1736,14 +1736,14 @@
 
     dates = g_new0(GDate*, num_marks);
     calDate = g_date_new_dmy(1, cal->month, cal->year);
-    
+
     for (idx = 0; idx < num_marks; idx++)
     {
         dates[idx] = g_date_new();
         gnc_dense_cal_model_get_instance(cal->model, tag, idx, dates[idx]);
     }
 
-    if(g_date_get_julian(dates[0]) < g_date_get_julian(calDate))
+    if (g_date_get_julian(dates[0]) < g_date_get_julian(calDate))
     {
         _gnc_dense_cal_set_month(cal, g_date_get_month(dates[0]), FALSE);
         _gnc_dense_cal_set_year(cal, g_date_get_year(dates[0]), FALSE);
@@ -1757,7 +1757,7 @@
     }
     g_free(dates);
     g_date_free(calDate);
-    
+
 cleanup:
     g_free(info);
 }

Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -1929,7 +1929,7 @@
     {
         g_free(old_page_name);
         g_free(old_page_long_name);
-	g_free(name);
+        g_free(name);
         LEAVE("no window widget available");
         return;
     }
@@ -3239,7 +3239,7 @@
     GError *error = NULL;
     g_assert(filename);
     merge_id = gtk_ui_manager_add_ui_from_file(window->ui_merge, filename,
-					       &error);
+               &error);
     g_free(filename);
     g_assert(merge_id);
 #ifndef MAC_INTEGRATION
@@ -3407,7 +3407,7 @@
 static void
 gnc_quartz_shutdown (GtkOSXApplication *theApp, gpointer data)
 {
-/* Do Nothing. It's too late. */
+    /* Do Nothing. It's too late. */
 }
 /* Should quit responds to NSApplicationBlockTermination; returning
  * TRUE means "don't terminate", FALSE means "do terminate". If we
@@ -3423,7 +3423,7 @@
     gboolean needs_save;
 
     if (!gnc_main_window_all_finish_pending() ||
-	gnc_file_save_in_progress())
+            gnc_file_save_in_progress())
     {
         return TRUE;
     }

Modified: gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -173,7 +173,7 @@
         {
             char* s;
 
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             s = scm_to_locale_string(item);
 
             if (i == 1)
@@ -185,8 +185,8 @@
             {
                 strings[i] = g_strdup(gettext(s));
             }
-            scm_dynwind_free (s); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (s);
+            scm_dynwind_end ();
         }
         else
         {

Modified: gnucash/trunk/src/gnome-utils/gnc-recurrence.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-recurrence.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-recurrence.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -191,9 +191,9 @@
 
     /* Open up the builder file */
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder,"gnc-recurrence.glade", "GCB_PeriodType_liststore");
-    gnc_builder_add_from_file (builder,"gnc-recurrence.glade", "GSB_Mult_Adj");
-    gnc_builder_add_from_file (builder,"gnc-recurrence.glade", "RecurrenceEntryVBox");
+    gnc_builder_add_from_file (builder, "gnc-recurrence.glade", "GCB_PeriodType_liststore");
+    gnc_builder_add_from_file (builder, "gnc-recurrence.glade", "GSB_Mult_Adj");
+    gnc_builder_add_from_file (builder, "gnc-recurrence.glade", "RecurrenceEntryVBox");
 
     vb = GTK_VBOX(gtk_builder_get_object (builder, "RecurrenceEntryVBox"));
     hb = GTK_HBOX(gtk_builder_get_object (builder, "Startdate_hbox"));

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-owner.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-owner.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-owner.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -161,8 +161,8 @@
         };
 
         gnc_tree_model_owner_type = g_type_register_static (GNC_TYPE_TREE_MODEL,
-                                      GNC_TREE_MODEL_OWNER_NAME,
-                                      &our_info, 0);
+                                    GNC_TREE_MODEL_OWNER_NAME,
+                                    &our_info, 0);
 
         g_type_add_interface_static (gnc_tree_model_owner_type,
                                      GTK_TYPE_TREE_MODEL,
@@ -384,7 +384,7 @@
 
 static GType
 gnc_tree_model_owner_get_column_type (GtkTreeModel *tree_model,
-                                        int index)
+                                      int index)
 {
     g_return_val_if_fail (GNC_IS_TREE_MODEL_OWNER (tree_model), G_TYPE_INVALID);
     g_return_val_if_fail ((index < GNC_TREE_MODEL_OWNER_NUM_COLUMNS) && (index >= 0), G_TYPE_INVALID);
@@ -684,7 +684,7 @@
 
 static gboolean
 gnc_tree_model_owner_iter_next (GtkTreeModel *tree_model,
-                                  GtkTreeIter *iter)
+                                GtkTreeIter *iter)
 {
     GncTreeModelOwner *model = GNC_TREE_MODEL_OWNER (tree_model);
     GncTreeModelOwnerPrivate *priv;
@@ -720,8 +720,8 @@
 
 static gboolean
 gnc_tree_model_owner_iter_children (GtkTreeModel *tree_model,
-                                      GtkTreeIter *iter,
-                                      GtkTreeIter *parent_iter)
+                                    GtkTreeIter *iter,
+                                    GtkTreeIter *parent_iter)
 {
     GncTreeModelOwnerPrivate *priv;
     GncTreeModelOwner *model;
@@ -755,7 +755,7 @@
 
 static gboolean
 gnc_tree_model_owner_iter_has_child (GtkTreeModel *tree_model,
-                                       GtkTreeIter *iter)
+                                     GtkTreeIter *iter)
 {
     /* Owner lists don't have children, so always return false */
     return FALSE;
@@ -763,7 +763,7 @@
 
 static int
 gnc_tree_model_owner_iter_n_children (GtkTreeModel *tree_model,
-                                        GtkTreeIter *iter)
+                                      GtkTreeIter *iter)
 {
     GncTreeModelOwner *model;
     GncTreeModelOwnerPrivate *priv;
@@ -788,9 +788,9 @@
 
 static gboolean
 gnc_tree_model_owner_iter_nth_child (GtkTreeModel *tree_model,
-                                       GtkTreeIter *iter,
-                                       GtkTreeIter *parent_iter,
-                                       int n)
+                                     GtkTreeIter *iter,
+                                     GtkTreeIter *parent_iter,
+                                     int n)
 {
     GncTreeModelOwner *model;
     GncTreeModelOwnerPrivate *priv;
@@ -836,8 +836,8 @@
 
 static gboolean
 gnc_tree_model_owner_iter_parent (GtkTreeModel *tree_model,
-                                    GtkTreeIter *iter,
-                                    GtkTreeIter *child)
+                                  GtkTreeIter *iter,
+                                  GtkTreeIter *child)
 {
     /* Owner lists don't have children, so always return false */
     iter->stamp = 0;
@@ -855,7 +855,7 @@
  */
 GncOwner *
 gnc_tree_model_owner_get_owner (GncTreeModelOwner *model,
-                                    GtkTreeIter *iter)
+                                GtkTreeIter *iter)
 {
     g_return_val_if_fail (GNC_IS_TREE_MODEL_OWNER (model), NULL);
     g_return_val_if_fail (iter != NULL, NULL);
@@ -982,9 +982,9 @@
  */
 static void
 gnc_tree_model_owner_event_handler (QofInstance *entity,
-                                      QofEventId event_type,
-                                      GncTreeModelOwner *model,
-                                      GncEventData *ed)
+                                    QofEventId event_type,
+                                    GncTreeModelOwner *model,
+                                    GncEventData *ed)
 {
     GncTreeModelOwnerPrivate *priv;
     GtkTreePath *path = NULL;
@@ -1041,7 +1041,7 @@
         if (!ed) /* Required for a remove. */
             break;
         DEBUG("remove owner %d (%s) from owner_list %p", ed->idx,
-                        gncOwnerGetName(&owner), priv->owner_list);
+              gncOwnerGetName(&owner), priv->owner_list);
         path = gtk_tree_path_new();
         if (!path)
         {

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -2294,7 +2294,7 @@
 gnc_tree_view_account_code_edited_cb(Account *account, GtkTreeViewColumn *col, const gchar *new_code)
 {
     if (safe_strcmp(xaccAccountGetCode(account), new_code) == 0)
-	return;
+        return;
     xaccAccountSetCode(account, new_code);
 }
 
@@ -2302,7 +2302,7 @@
 gnc_tree_view_account_description_edited_cb(Account *account, GtkTreeViewColumn *col, const gchar *new_desc)
 {
     if (safe_strcmp(xaccAccountGetDescription(account), new_desc) == 0)
-	return;
+        return;
     xaccAccountSetDescription(account, new_desc);
 }
 
@@ -2310,7 +2310,7 @@
 gnc_tree_view_account_notes_edited_cb(Account *account, GtkTreeViewColumn *col, const gchar *new_notes)
 {
     if (safe_strcmp(xaccAccountGetNotes(account), new_notes) == 0)
-	return;
+        return;
     xaccAccountSetNotes(account, new_notes);
 }
 

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -116,8 +116,8 @@
         };
 
         gnc_tree_view_owner_type = g_type_register_static (
-                                         GNC_TYPE_TREE_VIEW, GNC_TREE_VIEW_OWNER_NAME,
-                                         &our_info, 0);
+                                       GNC_TYPE_TREE_VIEW, GNC_TREE_VIEW_OWNER_NAME,
+                                       &our_info, 0);
     }
 
     return gnc_tree_view_owner_type;
@@ -193,8 +193,8 @@
  ************************************************************/
 static void
 gnc_tree_view_owner_active_toggled (GtkCellRendererToggle *cell,
-        const gchar *s_path_str,
-        gpointer user_data)
+                                    const gchar *s_path_str,
+                                    gpointer user_data)
 {
     GncTreeViewOwner *tree_view;
     GtkTreePath *s_path;
@@ -285,9 +285,9 @@
 
 static gint
 sort_by_boolean (GtkTreeModel *f_model,
-                GtkTreeIter *f_iter1,
-                GtkTreeIter *f_iter2,
-                gpointer user_data)
+                 GtkTreeIter *f_iter1,
+                 GtkTreeIter *f_iter2,
+                 gpointer user_data)
 {
     GtkTreeModel *model;
     GtkTreeIter iter1, iter2;
@@ -442,7 +442,7 @@
                                   GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                   sort_by_string);
     gnc_tree_view_add_text_column(view, _("Phone"), GNC_OWNER_TREE_PHONE_COL,
-                                   NULL, "+1-617-542-5942",
+                                  NULL, "+1-617-542-5942",
                                   GNC_TREE_MODEL_OWNER_COL_PHONE,
                                   GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                   sort_by_string);
@@ -519,7 +519,7 @@
 
 static GtkTreePath *
 gnc_tree_view_owner_get_path_from_owner (GncTreeViewOwner *view,
-                                         GncOwner *owner)
+        GncOwner *owner)
 {
     GtkTreeModel *model, *f_model, *s_model;
     GtkTreePath *path, *f_path, *s_path;
@@ -561,8 +561,8 @@
 
 static gboolean
 gnc_tree_view_owner_get_iter_from_owner (GncTreeViewOwner *view,
-                                         GncOwner *owner,
-                                         GtkTreeIter *s_iter)
+        GncOwner *owner,
+        GtkTreeIter *s_iter)
 {
     GtkTreeModel *model, *f_model, *s_model;
     GtkTreeIter iter, f_iter;
@@ -660,7 +660,7 @@
     g_return_val_if_fail (iter != NULL, FALSE);
 
     owner = gnc_tree_model_owner_get_owner (
-                  GNC_TREE_MODEL_OWNER(model), iter);
+                GNC_TREE_MODEL_OWNER(model), iter);
 
     priv = GNC_TREE_VIEW_OWNER_GET_PRIVATE(view);
     if (priv->filter_fn)
@@ -791,7 +791,7 @@
         GTK_TREE_MODEL_FILTER(f_model), &iter, &f_iter);
     model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
     owner = gnc_tree_model_owner_get_owner (
-                  GNC_TREE_MODEL_OWNER(model), &iter);
+                GNC_TREE_MODEL_OWNER(model), &iter);
     LEAVE("owner %p (%s)", owner, gncOwnerGetName (owner));
     return owner;
 }
@@ -843,7 +843,7 @@
  */
 void
 gnc_tree_view_owner_set_selected_owner (GncTreeViewOwner *view,
-        GncOwner *owner)
+                                        GncOwner *owner)
 {
     GtkTreeModel *model, *f_model, *s_model;
     GtkTreePath *path, *f_path, *s_path, *parent_path;
@@ -917,9 +917,9 @@
  */
 static void
 get_selected_owners_helper (GtkTreeModel *s_model,
-                              GtkTreePath *s_path,
-                              GtkTreeIter *s_iter,
-                              gpointer data)
+                            GtkTreePath *s_path,
+                            GtkTreeIter *s_iter,
+                            gpointer data)
 {
     GncTreeViewSelectionInfo *gtvsi = data;
     GtkTreeModel *f_model;
@@ -1103,10 +1103,10 @@
  * and the cell renderer's 'text' property. */
 static void
 owner_cell_kvp_data_func (GtkTreeViewColumn *tree_column,
-                            GtkCellRenderer *cell,
-                            GtkTreeModel *s_model,
-                            GtkTreeIter *s_iter,
-                            gpointer key)
+                          GtkCellRenderer *cell,
+                          GtkTreeModel *s_model,
+                          GtkTreeIter *s_iter,
+                          gpointer key)
 {
     GncOwner *owner;
     kvp_frame * frame;
@@ -1125,8 +1125,8 @@
 
 GtkTreeViewColumn *
 gnc_tree_view_owner_add_kvp_column (GncTreeViewOwner *view,
-                                      const gchar *column_title,
-                                      const gchar *kvp_key)
+                                    const gchar *column_title,
+                                    const gchar *kvp_key)
 {
     GtkCellRenderer *renderer;
     GtkTreeViewColumn *column;
@@ -1266,7 +1266,7 @@
  *  owner should be hidden. */
 gboolean
 gnc_plugin_page_owner_tree_filter_owners (GncOwner *owner,
-                                          gpointer user_data)
+        gpointer user_data)
 {
     OwnerFilterDialog *fd = user_data;
     gnc_numeric total;
@@ -1408,10 +1408,10 @@
     /* Update the dialog widgets for the current state */
     button = GTK_WIDGET(gtk_builder_get_object (builder, "show_inactive"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button),
-                                 fd->show_inactive);
+                                  fd->show_inactive);
     button = GTK_WIDGET(gtk_builder_get_object (builder, "show_zero"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button),
-                                 fd->show_zero_total);
+                                  fd->show_zero_total);
 
     /* Wire up the rest of the callbacks */
     gtk_builder_connect_signals (builder, fd);
@@ -1465,8 +1465,8 @@
 
 void
 gnc_tree_view_owner_save(GncTreeViewOwner *view,
-                           OwnerFilterDialog *fd,
-                           GKeyFile *key_file, const gchar *group_name)
+                         OwnerFilterDialog *fd,
+                         GKeyFile *key_file, const gchar *group_name)
 {
     bar_t bar;
 
@@ -1500,7 +1500,7 @@
                            GncOwnerType owner_type,
                            const gchar *owner_guid_str)
 {
-    GncOwner *owner=gncOwnerNew();
+    GncOwner *owner = gncOwnerNew();
     QofBook *book;
     GncGUID owner_guid;
 
@@ -1512,9 +1512,9 @@
 
 void
 gnc_tree_view_owner_restore(GncTreeViewOwner *view,
-                              OwnerFilterDialog *fd,
-                              GKeyFile *key_file, const gchar *group_name,
-                              GncOwnerType owner_type)
+                            OwnerFilterDialog *fd,
+                            GKeyFile *key_file, const gchar *group_name,
+                            GncOwnerType owner_type)
 {
     GError *error = NULL;
     gchar *key, *value;
@@ -1585,7 +1585,7 @@
 
 void
 gnc_tree_view_owner_set_name_edited(GncTreeViewOwner *view,
-                                      GncTreeViewOwnerColumnTextEdited edited_cb)
+                                    GncTreeViewOwnerColumnTextEdited edited_cb)
 {
     GncTreeViewOwnerPrivate *priv;
     priv = GNC_TREE_VIEW_OWNER_GET_PRIVATE(view);

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.h	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.h	2011-08-22 07:10:56 UTC (rev 21205)
@@ -103,7 +103,7 @@
 
 
 void owner_filter_dialog_create(OwnerFilterDialog *fd,
-                                  GncPluginPage *page);
+                                GncPluginPage *page);
 
 gboolean gnc_plugin_page_owner_tree_filter_owners (GncOwner *owner,
         gpointer user_data);
@@ -118,13 +118,13 @@
 
 /* Saving/Restoring */
 void gnc_tree_view_owner_save(GncTreeViewOwner *tree_view,
-                                OwnerFilterDialog *fd,
-                                GKeyFile *key_file, const gchar *group_name);
+                              OwnerFilterDialog *fd,
+                              GKeyFile *key_file, const gchar *group_name);
 void gnc_tree_view_owner_restore(GncTreeViewOwner *view,
-                                   OwnerFilterDialog *fd,
-                                   GKeyFile *key_file,
-                                   const gchar *group_name,
-                                   GncOwnerType owner_type);
+                                 OwnerFilterDialog *fd,
+                                 GKeyFile *key_file,
+                                 const gchar *group_name,
+                                 GncOwnerType owner_type);
 
 
 /* Get the GType for an GncTreeViewOwner object. */
@@ -196,8 +196,8 @@
  */
 GtkTreeViewColumn *
 gnc_tree_view_owner_add_kvp_column (GncTreeViewOwner *view,
-                                      const gchar *column_title,
-                                      const gchar *kvp_key);
+                                    const gchar *column_title,
+                                    const gchar *kvp_key);
 
 /** @} */
 
@@ -216,7 +216,7 @@
  *  @param avi A pointer to an old style filter block to fill in.
  */
 void gnc_tree_view_owner_get_view_info (GncTreeViewOwner *owner_view,
-        OwnerViewInfo *avi);
+                                        OwnerViewInfo *avi);
 
 /** Given pointers to an owner tree and old style filter block, this
  *  function will applies the settings specified to the current
@@ -230,7 +230,7 @@
  *  view.
  */
 void gnc_tree_view_owner_set_view_info (GncTreeViewOwner *owner_view,
-        OwnerViewInfo *avi);
+                                        OwnerViewInfo *avi);
 
 
 /** This is the description of a filter function used by the owner tree.
@@ -264,9 +264,9 @@
  *  NULL.
  */
 void gnc_tree_view_owner_set_filter (GncTreeViewOwner *owner_view,
-                                       gnc_tree_view_owner_filter_func func,
-                                       gpointer data,
-                                       GtkFunction destroy);
+                                     gnc_tree_view_owner_filter_func func,
+                                     gpointer data,
+                                     GtkFunction destroy);
 
 
 /** This function forces the owner tree filter to be evaluated.  It

Modified: gnucash/trunk/src/gnome-utils/window-main-summarybar.c
===================================================================
--- gnucash/trunk/src/gnome-utils/window-main-summarybar.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/gnome-utils/window-main-summarybar.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -388,11 +388,11 @@
 
     root = gnc_get_current_root_account ();
     options.default_currency = xaccAccountGetCommodity(root);
-    if(options.default_currency == NULL)
-    {	
-      options.default_currency = gnc_default_currency ();
+    if (options.default_currency == NULL)
+    {
+        options.default_currency = gnc_default_currency ();
     }
-  
+
     options.euro = gnc_gconf_get_bool(GCONF_GENERAL, KEY_ENABLE_EURO, NULL);
     options.grand_total =
         gnc_gconf_get_bool(GCONF_SECTION, KEY_GRAND_TOTAL, NULL);

Modified: gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -95,21 +95,23 @@
     /* Initialize gwen logging */
     if (gnc_gconf_get_bool(GCONF_SECTION_AQBANKING, KEY_VERBOSE_DEBUG, NULL))
     {
-	if (!gwen_logging) {
-	    GWEN_Logger_SetLevel(NULL, GWEN_LoggerLevel_Info);
-	    GWEN_Logger_SetLevel(GWEN_LOGDOMAIN, GWEN_LoggerLevel_Info);
-	}
-	if (!aqb_logging)
-	    GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Debug);
+        if (!gwen_logging)
+        {
+            GWEN_Logger_SetLevel(NULL, GWEN_LoggerLevel_Info);
+            GWEN_Logger_SetLevel(GWEN_LOGDOMAIN, GWEN_LoggerLevel_Info);
+        }
+        if (!aqb_logging)
+            GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Debug);
     }
     else
     {
-	if (!gwen_logging) {
-	    GWEN_Logger_SetLevel(NULL, GWEN_LoggerLevel_Error);
-	    GWEN_Logger_SetLevel(GWEN_LOGDOMAIN, GWEN_LoggerLevel_Error);
-	}
-	if (!aqb_logging)
-	    GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Warning);
+        if (!gwen_logging)
+        {
+            GWEN_Logger_SetLevel(NULL, GWEN_LoggerLevel_Error);
+            GWEN_Logger_SetLevel(GWEN_LOGDOMAIN, GWEN_LoggerLevel_Error);
+        }
+        if (!aqb_logging)
+            GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Warning);
     }
     g_free(gwen_logging);
     g_free(aqb_logging);

Modified: gnucash/trunk/src/import-export/aqbanking/gnc-file-aqb-import.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-file-aqb-import.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-file-aqb-import.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -180,15 +180,15 @@
     g_assert(io);
     GWEN_SyncIo_AddFlags(io, GWEN_SYNCIO_FILE_FLAGS_READ);
     {
-	/* We must explicitly call "Connect" on the GWEN_SYNCIO
-	 * object. */
-	int rv = GWEN_SyncIo_Connect(io);
-	if (rv < 0)
-	{
-	    g_warning("gnc_file_aqbanking_import: Failed to open file %s: %d", selected_filename, rv);
-	    goto cleanup;
-	}
-	g_assert(GWEN_SyncIo_GetStatus(io) == GWEN_SyncIo_Status_Connected);
+        /* We must explicitly call "Connect" on the GWEN_SYNCIO
+         * object. */
+        int rv = GWEN_SyncIo_Connect(io);
+        if (rv < 0)
+        {
+            g_warning("gnc_file_aqbanking_import: Failed to open file %s: %d", selected_filename, rv);
+            goto cleanup;
+        }
+        g_assert(GWEN_SyncIo_GetStatus(io) == GWEN_SyncIo_Status_Connected);
     }
 #else
     io = GWEN_Io_LayerFile_new(dtaus_fd, -1);
@@ -340,9 +340,9 @@
     if (io)
     {
 #ifdef AQBANKING_VERSION_5_PLUS
-	GWEN_SyncIo_free(io);
+        GWEN_SyncIo_free(io);
 #else
-	GWEN_Io_Layer_free(io);
+        GWEN_Io_Layer_free(io);
 #endif
     }
 

Modified: gnucash/trunk/src/import-export/import-backend.c
===================================================================
--- gnucash/trunk/src/import-export/import-backend.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/import-export/import-backend.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -728,7 +728,7 @@
                     /* DEBUG("heuristics:  probability + 2 (memo)"); */
                 }
                 else if ((strncasecmp(memo, xaccSplitGetMemo(split),
-                                  strlen(xaccSplitGetMemo(split)) / 2)
+                                      strlen(xaccSplitGetMemo(split)) / 2)
                           == 0))
                 {
                     /* Very primitive fuzzy match worth +1.  This matches the
@@ -747,7 +747,7 @@
             if (descr && strlen(descr) != 0)
             {
                 if (safe_strcasecmp(descr,
-                                xaccTransGetDescription(xaccSplitGetParent(split)))
+                                    xaccTransGetDescription(xaccSplitGetParent(split)))
                         == 0)
                 {
                     /*An exact match of Description gives a +2 */
@@ -755,8 +755,8 @@
                     /*DEBUG("heuristics:  probability + 2 (description)");*/
                 }
                 else if ((strncasecmp(descr,
-                                  xaccTransGetDescription (xaccSplitGetParent(split)),
-                                  strlen(xaccTransGetDescription (new_trans)) / 2)
+                                      xaccTransGetDescription (xaccSplitGetParent(split)),
+                                      strlen(xaccTransGetDescription (new_trans)) / 2)
                           == 0))
                 {
                     /* Very primitive fuzzy match worth +1.  This matches the

Modified: gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -95,11 +95,11 @@
         {
             char * str;
 
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (SCM_CAR(current));
             compname = g_strdup(str);
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
         }
         else
             compname = g_strdup("");
@@ -340,11 +340,11 @@
     {
         char * str;
 
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         str = scm_to_locale_string (orig_acct);
         wind->selected_name = g_strdup(str);
-        scm_dynwind_free (str); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (str);
+        scm_dynwind_end ();
     }
 
     xml = gnc_glade_xml_new("qif.glade", "QIF Import Account Picker");

Modified: gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/druid-qif-import.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/import-export/qif-import/druid-qif-import.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -247,21 +247,21 @@
         {
             char * str;
 
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (scm_call_1(get_qif_name, SCM_CAR(accts_left)));
             qif_name = g_strdup (str);
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
         }
         if (scm_is_string(scm_call_1(get_gnc_name, SCM_CAR(accts_left))))
         {
             char * str;
 
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (scm_call_1(get_gnc_name, SCM_CAR(accts_left)));
             gnc_name = g_strdup (str);
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
         }
         checked  = (scm_call_1(get_new, SCM_CAR(accts_left)) == SCM_BOOL_T);
 
@@ -908,11 +908,11 @@
         {
             char * str;
 
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (SCM_CADR(load_return));
             /* str doesn't seem to be used anywhere, so go ahead and free it */
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
         }
 
         if (SCM_CAR(load_return) == SCM_BOOL_F)
@@ -1129,11 +1129,11 @@
         {
             char * str;
 
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (scm_call_1(default_acct, wind->selected_file));
             default_acctname = g_strdup (str);
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
         }
         gtk_entry_set_text(GTK_ENTRY(wind->acct_entry), default_acctname);
 
@@ -1238,12 +1238,12 @@
         {
             char * str;
 
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (scm_call_1(default_acct,
-                                                wind->selected_file));
+                                                   wind->selected_file));
             default_acctname = g_strdup (str);
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
         }
         gtk_entry_set_text(GTK_ENTRY(wind->acct_entry), default_acctname);
 
@@ -1294,11 +1294,11 @@
         {
             char * str;
 
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (scm_call_1(qif_file_path, scm_qiffile));
             row_text = g_strdup (str);
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
         }
 
         gtk_list_store_append(store, &iter);

Modified: gnucash/trunk/src/libqof/qof/qofobject.c
===================================================================
--- gnucash/trunk/src/libqof/qof/qofobject.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/libqof/qof/qofobject.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -49,16 +49,28 @@
 GHashTable* get_backend_data( void );
 
 gboolean
-get_object_is_initialized( void ) { return object_is_initialized; }
+get_object_is_initialized( void )
+{
+    return object_is_initialized;
+}
 
 GList*
-get_object_modules( void ) { return object_modules; }
+get_object_modules( void )
+{
+    return object_modules;
+}
 
 GList*
-get_book_list( void ) { return book_list; }
+get_book_list( void )
+{
+    return book_list;
+}
 
 GHashTable*
-get_backend_data( void ) { return backend_data; }
+get_backend_data( void )
+{
+    return backend_data;
+}
 
 /*********/
 

Modified: gnucash/trunk/src/libqof/qof/test/test-kvp_frame.c
===================================================================
--- gnucash/trunk/src/libqof/qof/test/test-kvp_frame.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/libqof/qof/test/test-kvp_frame.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -59,8 +59,8 @@
     fixture->frame = kvp_frame_new();
     init_static_test_pointers();
     g_assert( p_get_trailer_make && p_kvp_value_glist_to_string &&
-	      p_get_or_make && p_kvp_frame_get_frame_or_null_slash_trash &&
-	      p_get_trailer_or_null );
+              p_get_or_make && p_kvp_frame_get_frame_or_null_slash_trash &&
+              p_get_trailer_or_null );
 }
 
 static void
@@ -80,16 +80,16 @@
     KvpFrame *frame;
     Timespec ts;
     GncGUID *guid;
-    
+
     ts.tv_sec = 1;
     ts.tv_nsec = 1;
     guid = guid_malloc();
     guid_new( guid );
-    
+
     frame = kvp_frame_new();
     g_assert( frame );
     g_assert( kvp_frame_is_empty( frame ) );
-    
+
     kvp_frame_set_gint64( frame, "gint64-type", 100 );
     kvp_frame_set_double( frame, "double-type", 3.14159 );
     kvp_frame_set_numeric( frame, "numeric-type", gnc_numeric_zero() );
@@ -97,12 +97,12 @@
     kvp_frame_set_string( frame, "string-type", "abcdefghijklmnop" );
     kvp_frame_set_guid( frame, "guid-type", guid );
     kvp_frame_set_frame( frame, "frame-type", kvp_frame_new() );
-    
+
     g_assert( !kvp_frame_is_empty( frame ) );
-    
+
     kvp_frame_delete( frame );
     g_assert( frame );
-    
+
     guid_free( guid );
 }
 
@@ -117,7 +117,7 @@
     const char* test_str, *copy_str;
     GncGUID *test_guid, *copy_guid;
     KvpFrame *test_frame, *copy_frame;
-    
+
     /* init data in source frame */
     test_gint64 = 111;
     test_double = 1.1;
@@ -128,7 +128,7 @@
     test_guid = guid_malloc();
     guid_new( test_guid );
     test_frame = kvp_frame_new();
-    
+
     g_assert( fixture->frame );
     kvp_frame_set_gint64( fixture->frame, "gint64-type", test_gint64 );
     kvp_frame_set_double( fixture->frame, "double-type", test_double );
@@ -138,30 +138,30 @@
     kvp_frame_set_guid( fixture->frame, "guid-type", test_guid );
     kvp_frame_set_frame( fixture->frame, "frame-type", test_frame );
     g_assert( !kvp_frame_is_empty( fixture->frame ) );
-    
+
     g_test_message( "Test frame copy" );
     to_copy = kvp_frame_copy( fixture->frame );
     g_assert( to_copy );
     g_assert( !kvp_frame_is_empty( to_copy ) );
     g_assert( to_copy != fixture->frame );
-    g_assert_cmpint( kvp_frame_compare( fixture->frame, to_copy ), ==, 0 );
+    g_assert_cmpint( kvp_frame_compare( fixture->frame, to_copy ), == , 0 );
     copy_gint64 = kvp_frame_get_gint64( to_copy, "gint64-type" );
     g_assert( &copy_gint64 != &test_gint64 );
-    g_assert_cmpint( copy_gint64, ==, test_gint64 );
+    g_assert_cmpint( copy_gint64, == , test_gint64 );
     copy_double = kvp_frame_get_double( to_copy, "double-type" );
     g_assert( &copy_double != &test_double );
-    g_assert_cmpfloat( copy_double, ==, test_double );
+    g_assert_cmpfloat( copy_double, == , test_double );
     copy_gnc_numeric = kvp_frame_get_numeric( to_copy, "numeric-type" );
     g_assert( &copy_gnc_numeric != &test_gnc_numeric );
-    g_assert_cmpfloat( copy_gnc_numeric.num, ==, test_gnc_numeric.num );
-    g_assert_cmpfloat( copy_gnc_numeric.denom, ==, test_gnc_numeric.denom );
+    g_assert_cmpfloat( copy_gnc_numeric.num, == , test_gnc_numeric.num );
+    g_assert_cmpfloat( copy_gnc_numeric.denom, == , test_gnc_numeric.denom );
     copy_ts = kvp_frame_get_timespec( to_copy, "timespec-type" );
     g_assert( &copy_ts != &test_ts );
-    g_assert_cmpfloat( copy_ts.tv_sec, ==, test_ts.tv_sec );
-    g_assert_cmpfloat( copy_ts.tv_nsec, ==, test_ts.tv_nsec );
+    g_assert_cmpfloat( copy_ts.tv_sec, == , test_ts.tv_sec );
+    g_assert_cmpfloat( copy_ts.tv_nsec, == , test_ts.tv_nsec );
     copy_str = kvp_frame_get_string( to_copy, "string-type" );
     g_assert( copy_str != test_str );
-    g_assert_cmpstr( copy_str, ==, test_str );
+    g_assert_cmpstr( copy_str, == , test_str );
     copy_guid = kvp_frame_get_guid( to_copy, "guid-type" );
     g_assert( copy_guid != test_guid );
     g_assert( guid_equal( copy_guid, test_guid ) );
@@ -169,8 +169,8 @@
     g_assert( copy_frame );
     g_assert( kvp_frame_is_empty( copy_frame ) );
     g_assert( copy_frame != test_frame );
-    g_assert_cmpint( kvp_frame_compare( copy_frame, test_frame ), ==, 0 );
-       
+    g_assert_cmpint( kvp_frame_compare( copy_frame, test_frame ), == , 0 );
+
     kvp_frame_delete( to_copy );
     guid_free( test_guid );
 }
@@ -181,68 +181,68 @@
     gnc_numeric test_gnc_numeric, copy_gnc_numeric;
     Timespec test_ts, copy_ts;
     GncGUID *test_guid, *copy_guid;
-    
+
     test_gnc_numeric = gnc_numeric_zero();
     test_ts.tv_sec = 1;
     test_ts.tv_nsec = 1;
     test_guid = guid_malloc();
     guid_new( test_guid );
-    
+
     g_assert( fixture->frame );
     g_assert( kvp_frame_is_empty( fixture->frame ) );
-  
+
     g_test_message( "Test gint64 setup and replace, test frame is created" );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test" ) == NULL );
     kvp_frame_set_gint64( fixture->frame, "/test/gint64", 1 );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test" ) != NULL );
-    g_assert_cmpint( kvp_frame_get_gint64( fixture->frame, "/test/gint64" ), ==, 1 );
+    g_assert_cmpint( kvp_frame_get_gint64( fixture->frame, "/test/gint64" ), == , 1 );
     kvp_frame_set_gint64( fixture->frame, "/test/gint64", 5 );
-    g_assert_cmpint( kvp_frame_get_gint64( fixture->frame, "/test/gint64" ), ==, 5 );
-    
+    g_assert_cmpint( kvp_frame_get_gint64( fixture->frame, "/test/gint64" ), == , 5 );
+
     g_test_message( "Test double setup and replace, test2 frame is created" );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test2" ) == NULL );
     kvp_frame_set_double( fixture->frame, "/test2/double", 1.1 );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test2" ) != NULL );
-    g_assert_cmpfloat( kvp_frame_get_double( fixture->frame, "/test2/double" ), ==, 1.1 );
+    g_assert_cmpfloat( kvp_frame_get_double( fixture->frame, "/test2/double" ), == , 1.1 );
     kvp_frame_set_double( fixture->frame, "/test2/double", 5.5 );
-    g_assert_cmpfloat( kvp_frame_get_double( fixture->frame, "/test2/double" ), ==, 5.5 );
-    
+    g_assert_cmpfloat( kvp_frame_get_double( fixture->frame, "/test2/double" ), == , 5.5 );
+
     g_test_message( "Test double setup and replace, test3 frame is created" );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test3" ) == NULL );
     kvp_frame_set_numeric( fixture->frame, "/test3/numeric", test_gnc_numeric );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test3" ) != NULL );
     copy_gnc_numeric = kvp_frame_get_numeric( fixture->frame, "/test3/numeric" );
-    g_assert_cmpint( copy_gnc_numeric.num, ==, 0 );
-    g_assert_cmpint( copy_gnc_numeric.denom, ==, 1 );
+    g_assert_cmpint( copy_gnc_numeric.num, == , 0 );
+    g_assert_cmpint( copy_gnc_numeric.denom, == , 1 );
     test_gnc_numeric.num = 2;
     test_gnc_numeric.denom = 3;
     kvp_frame_set_numeric( fixture->frame, "/test3/numeric", test_gnc_numeric );
     copy_gnc_numeric = kvp_frame_get_numeric( fixture->frame, "/test3/numeric" );
-    g_assert_cmpint( copy_gnc_numeric.num, ==, 2 );
-    g_assert_cmpint( copy_gnc_numeric.denom, ==, 3 );
-    
+    g_assert_cmpint( copy_gnc_numeric.num, == , 2 );
+    g_assert_cmpint( copy_gnc_numeric.denom, == , 3 );
+
     g_test_message( "Test timespec setup and replace, test4 frame is created" );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test4" ) == NULL );
     kvp_frame_set_timespec( fixture->frame, "/test4/timespec", test_ts );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test4" ) != NULL );
     copy_ts = kvp_frame_get_timespec( fixture->frame, "/test4/timespec" );
-    g_assert_cmpint( copy_ts.tv_sec, ==, 1 );
-    g_assert_cmpint( copy_ts.tv_nsec, ==, 1 );
+    g_assert_cmpint( copy_ts.tv_sec, == , 1 );
+    g_assert_cmpint( copy_ts.tv_nsec, == , 1 );
     test_ts.tv_sec = 7;
     test_ts.tv_nsec = 13;
     kvp_frame_set_timespec( fixture->frame, "/test4/timespec", test_ts );
     copy_ts = kvp_frame_get_timespec( fixture->frame, "/test4/timespec" );
-    g_assert_cmpint( copy_ts.tv_sec, ==, 7 );
-    g_assert_cmpint( copy_ts.tv_nsec, ==, 13 );
+    g_assert_cmpint( copy_ts.tv_sec, == , 7 );
+    g_assert_cmpint( copy_ts.tv_nsec, == , 13 );
 
     g_test_message( "Test string setup and replace, test5 frame is created" );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test5" ) == NULL );
     kvp_frame_set_string( fixture->frame, "/test5/string", "one string" );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test5" ) != NULL );
-    g_assert_cmpstr( kvp_frame_get_string( fixture->frame, "/test5/string" ), ==, "one string" );
+    g_assert_cmpstr( kvp_frame_get_string( fixture->frame, "/test5/string" ), == , "one string" );
     kvp_frame_set_string( fixture->frame, "/test5/string", "another string" );
-    g_assert_cmpstr( kvp_frame_get_string( fixture->frame, "/test5/string" ), ==, "another string" );
- 
+    g_assert_cmpstr( kvp_frame_get_string( fixture->frame, "/test5/string" ), == , "another string" );
+
     g_test_message( "Test guid setup and replace, test6 frame is created" );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test6" ) == NULL );
     kvp_frame_set_guid( fixture->frame, "/test6/guid", test_guid );
@@ -252,7 +252,7 @@
     kvp_frame_set_guid( fixture->frame, "/test6/guid", guid_null() );
     copy_guid = kvp_frame_get_guid( fixture->frame, "/test6/guid" );
     g_assert( guid_equal( copy_guid, guid_null() ) );
-    
+
     g_test_message( "Test frame setup and replace, test7 frame is created" );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test7" ) == NULL );
     kvp_frame_set_frame( fixture->frame, "/test7", kvp_frame_new() );
@@ -267,30 +267,30 @@
     KvpFrame *result_frame = NULL;
     /* Mostly testing static routine kvp_frmae_get_frame_slash_trash */
     g_assert( fixture->frame );
-    
+
     g_test_message( "Test path with one slash same frame should be returned" );
     result_frame = kvp_frame_get_frame_slash( fixture->frame, "/" );
     g_assert( result_frame );
     g_assert( result_frame == fixture->frame );
-    
+
     g_test_message( "Test path with trailing slash same frame should be returned" );
     result_frame = kvp_frame_get_frame_slash( fixture->frame, "/////" );
     g_assert( result_frame );
     g_assert( result_frame == fixture->frame );
-    
+
     g_test_message( "Test new frame is created" );
     result_frame = kvp_frame_get_frame_slash( fixture->frame, "/test" );
     g_assert( result_frame );
     g_assert( result_frame != fixture->frame );
     g_assert( result_frame == kvp_frame_get_frame( fixture->frame, "/test" ) );
-    
+
     g_test_message( "Test trailing slashes are ignored and frame created" );
     result_frame = kvp_frame_get_frame_slash( fixture->frame, "////test2/////" );
     g_assert( result_frame );
     g_assert( result_frame != fixture->frame );
     g_assert( result_frame == kvp_frame_get_frame( fixture->frame, "/test2" ) );
     g_assert( result_frame != kvp_frame_get_frame( fixture->frame, "/test" ) );
-    
+
     g_test_message( "Test frames are created along the path if not exist and last frame is returned" );
     result_frame = kvp_frame_get_frame_slash( fixture->frame, "////test3/////test4//////" );
     g_assert( result_frame );
@@ -300,7 +300,7 @@
     g_assert( kvp_frame_get_frame( fixture->frame, "/test3" ) != NULL );
     g_assert( result_frame != kvp_frame_get_frame( fixture->frame, "/test3" ) );
     g_assert( result_frame == kvp_frame_get_frame( fixture->frame, "/test3/test4" ) );
-    
+
     g_test_message( "Test existing frame is returned" );
     g_assert( result_frame == kvp_frame_get_frame_slash( fixture->frame, "////test3/////test4//////" ) );
 }
@@ -309,33 +309,33 @@
 test_kvp_frame_get_slot_path( Fixture *fixture, gconstpointer pData )
 {
     KvpValue *result_value = NULL ;
-  
+
     g_assert( fixture->frame );
     g_assert( kvp_frame_is_empty( fixture->frame ) );
-    
+
     g_test_message( "Test with non existing path should return NULL" );
     result_value = kvp_frame_get_slot_path( fixture->frame, "test", "test2", NULL );
     g_assert( !result_value );
-    
+
     g_test_message( "Test with existing value set to current frame" );
     kvp_frame_set_gint64( fixture->frame, "/test", 1 );
     result_value = kvp_frame_get_slot_path( fixture->frame, "test", NULL );
     g_assert( result_value );
     g_assert( kvp_value_get_type( result_value ) == KVP_TYPE_GINT64 );
-    g_assert_cmpint( kvp_value_get_gint64( result_value ), ==, 1 );
-    
+    g_assert_cmpint( kvp_value_get_gint64( result_value ), == , 1 );
+
     g_test_message( "Test should return null as test is not a frame" );
     kvp_frame_set_gint64( fixture->frame, "/test/test2", 2 );
     result_value = kvp_frame_get_slot_path( fixture->frame, "test", "test2", NULL );
     g_assert( !result_value );
-    
+
     g_test_message( "Test should return last value in the path" );
     kvp_frame_set_gint64( fixture->frame, "/test2/test3", 2 );
     result_value = kvp_frame_get_slot_path( fixture->frame, "test2", "test3", NULL );
     g_assert( result_value );
     g_assert( kvp_value_get_type( result_value ) == KVP_TYPE_GINT64 );
-    g_assert_cmpint( kvp_value_get_gint64( result_value ), ==, 2 );
-    
+    g_assert_cmpint( kvp_value_get_gint64( result_value ), == , 2 );
+
     g_test_message( "Test should return null as last value in the path does not exist" );
     result_value = kvp_frame_get_slot_path( fixture->frame, "test2", "test3", "test4", NULL );
     g_assert( !result_value );
@@ -347,30 +347,30 @@
     /* similar to previous test except path is passed as GSList*/
     GSList *path_list = NULL;
     KvpValue *result_value = NULL ;
-  
+
     g_assert( fixture->frame );
     g_assert( kvp_frame_is_empty( fixture->frame ) );
-    
+
     g_test_message( "Test with non existing path should return NULL" );
     path_list = g_slist_append (path_list, "test");
     path_list = g_slist_append (path_list, "test2");
     result_value = kvp_frame_get_slot_path_gslist( fixture->frame, path_list );
     g_assert( !result_value );
-    
+
     g_test_message( "Test with existing value set to current frame" );
     path_list = g_slist_remove( path_list, "test2" );
     kvp_frame_set_gint64( fixture->frame, "/test", 1 );
     result_value = kvp_frame_get_slot_path_gslist( fixture->frame, path_list );
     g_assert( result_value );
     g_assert( kvp_value_get_type( result_value ) == KVP_TYPE_GINT64 );
-    g_assert_cmpint( kvp_value_get_gint64( result_value ), ==, 1 );
-    
+    g_assert_cmpint( kvp_value_get_gint64( result_value ), == , 1 );
+
     g_test_message( "Test should return null as test is not a frame" );
     path_list = g_slist_append (path_list, "test2");
     kvp_frame_set_gint64( fixture->frame, "/test/test2", 2 );
     result_value = kvp_frame_get_slot_path_gslist( fixture->frame, path_list );
     g_assert( !result_value );
-    
+
     g_test_message( "Test should return last value in the path" );
     path_list = g_slist_remove( path_list, "test" );
     path_list = g_slist_append (path_list, "test3");
@@ -378,8 +378,8 @@
     result_value = kvp_frame_get_slot_path_gslist( fixture->frame, path_list );
     g_assert( result_value );
     g_assert( kvp_value_get_type( result_value ) == KVP_TYPE_GINT64 );
-    g_assert_cmpint( kvp_value_get_gint64( result_value ), ==, 2 );
-    
+    g_assert_cmpint( kvp_value_get_gint64( result_value ), == , 2 );
+
     g_test_message( "Test should return null as last value in the path does not exist" );
     path_list = g_slist_append (path_list, "test4");
     result_value = kvp_frame_get_slot_path_gslist( fixture->frame, path_list );
@@ -390,21 +390,21 @@
 static void
 test_kvp_frame_add_frame_nc( Fixture *fixture, gconstpointer pData )
 {
-    /* basically we test static function kvp_frame_add_value_nc 
+    /* basically we test static function kvp_frame_add_value_nc
      * if path not exist it's created
      * if gslist exist on the path new value added to the list
      * if any other value exist it's converted to gslist and newvalue added
      */
-    KvpFrame *test_frame = NULL, 
-	     *test_frame2 = NULL,
-	     *test_frame3 = NULL,
-	     *result_frame = NULL;
+    KvpFrame *test_frame = NULL,
+              *test_frame2 = NULL,
+               *test_frame3 = NULL,
+                *result_frame = NULL;
     KvpValue *result_value = NULL;
     GList *result_list = NULL;
-    
+
     g_assert( fixture->frame );
     g_assert( kvp_frame_is_empty( fixture->frame ) );
-    
+
     g_test_message( "Test when path does not exist it is created" );
     result_frame = kvp_frame_get_frame( fixture->frame, "/test/test2/test3" );
     g_assert( !result_frame );
@@ -417,14 +417,14 @@
     g_assert( result_frame != test_frame );
     result_frame = kvp_frame_get_frame( fixture->frame, "/test" );
     g_assert( result_frame != test_frame );
-    
+
     g_test_message( "Test when value exist on the path it's converted to bag and new value added" );
     test_frame2 = kvp_frame_new();
     kvp_frame_add_frame_nc( fixture->frame, "/test/test2/test3", test_frame2 );
     result_value = kvp_frame_get_value( fixture->frame, "/test/test2/test3" );
     result_list = kvp_value_get_glist( result_value );
     g_assert( result_list );
-    g_assert_cmpint( g_list_length( result_list ), ==, 2 );
+    g_assert_cmpint( g_list_length( result_list ), == , 2 );
     result_value = g_list_first( result_list )->data;
     g_assert( result_value );
     g_assert( kvp_value_get_type( result_value ) == KVP_TYPE_FRAME );
@@ -433,13 +433,13 @@
     g_assert( result_value );
     g_assert( kvp_value_get_type( result_value ) == KVP_TYPE_FRAME );
     g_assert( kvp_value_get_frame( result_value ) == test_frame2 );
-    
+
     g_test_message( "Test when bag exists on the path new values are added to it" );
     test_frame3 = kvp_frame_new();
     kvp_frame_add_frame_nc( fixture->frame, "/test/test2/test3", test_frame3 );
     result_value = kvp_frame_get_value( fixture->frame, "/test/test2/test3" );
     g_assert( result_list == kvp_value_get_glist( result_value ) ); /* same list used */
-    g_assert_cmpint( g_list_length( result_list ), ==, 3 );
+    g_assert_cmpint( g_list_length( result_list ), == , 3 );
     result_value = g_list_first( result_list )->data;
     g_assert( result_value );
     g_assert( kvp_value_get_type( result_value ) == KVP_TYPE_FRAME );
@@ -465,14 +465,14 @@
     KvpValue *timespec_orig_value, *timespec_copy_value;
     KvpValue *glist_orig_value, *glist_copy_value;
     KvpValue *frame_orig_value, *frame_copy_value;
- 
+
     /* data init */
     gnc_numeric gnc_numeric_orig, gnc_numeric_copy;
     GncGUID *guid_orig, *guid_copy;
     Timespec ts_orig, ts_copy;
     GList *list_orig, *list_copy;
     KvpFrame *frame_orig, *frame_copy;
-    
+
     gnc_numeric_orig = gnc_numeric_zero();
     guid_orig = guid_malloc();
     guid_new( guid_orig );
@@ -481,7 +481,7 @@
     list_orig = NULL;
     list_orig = g_list_append( list_orig, kvp_value_new_string( "abcdefghijklmnop" ) );
     frame_orig = kvp_frame_new();
-    
+
     g_test_message( "Test creates original values and checks copies of them" );
     gint64_orig_value = kvp_value_new_gint64( 2 );
     double_orig_value = kvp_value_new_double( 3.3 );
@@ -491,36 +491,36 @@
     timespec_orig_value = kvp_value_new_timespec( ts_orig );
     glist_orig_value = kvp_value_new_glist( list_orig );
     frame_orig_value = kvp_value_new_frame( frame_orig );
-    g_assert( gint64_orig_value && double_orig_value && numeric_orig_value && string_orig_value 
-	      && guid_orig_value && timespec_orig_value && glist_orig_value && frame_orig_value );
-    
+    g_assert( gint64_orig_value && double_orig_value && numeric_orig_value && string_orig_value
+              && guid_orig_value && timespec_orig_value && glist_orig_value && frame_orig_value );
+
     /* copy values */
     gint64_copy_value = kvp_value_copy( gint64_orig_value );
     g_assert( gint64_copy_value );
     g_assert( gint64_copy_value != gint64_orig_value );
     g_assert( kvp_value_get_type( gint64_copy_value ) == KVP_TYPE_GINT64 );
-    g_assert_cmpint( kvp_value_get_gint64( gint64_copy_value ), ==, 2 );
-    
+    g_assert_cmpint( kvp_value_get_gint64( gint64_copy_value ), == , 2 );
+
     double_copy_value = kvp_value_copy( double_orig_value );
     g_assert( double_copy_value );
     g_assert( double_copy_value != double_orig_value );
     g_assert( kvp_value_get_type( double_copy_value ) == KVP_TYPE_DOUBLE );
-    g_assert_cmpfloat( kvp_value_get_double( double_copy_value ), ==, 3.3 );
-    
+    g_assert_cmpfloat( kvp_value_get_double( double_copy_value ), == , 3.3 );
+
     numeric_copy_value = kvp_value_copy( numeric_orig_value );
     g_assert( numeric_copy_value );
     g_assert( numeric_copy_value != numeric_orig_value );
     g_assert( kvp_value_get_type( numeric_copy_value ) == KVP_TYPE_NUMERIC );
     gnc_numeric_copy = kvp_value_get_numeric( numeric_copy_value );
-    g_assert_cmpfloat( gnc_numeric_copy.num, ==, gnc_numeric_orig.num );
-    g_assert_cmpfloat( gnc_numeric_copy.denom, ==, gnc_numeric_orig.denom );
-    
+    g_assert_cmpfloat( gnc_numeric_copy.num, == , gnc_numeric_orig.num );
+    g_assert_cmpfloat( gnc_numeric_copy.denom, == , gnc_numeric_orig.denom );
+
     string_copy_value = kvp_value_copy( string_orig_value );
     g_assert( string_copy_value );
     g_assert( string_copy_value != string_orig_value );
     g_assert( kvp_value_get_type( string_copy_value ) == KVP_TYPE_STRING );
-    g_assert_cmpstr( kvp_value_get_string( string_copy_value ), ==, "abcdefghijklmnop" );
-    
+    g_assert_cmpstr( kvp_value_get_string( string_copy_value ), == , "abcdefghijklmnop" );
+
     guid_copy_value = kvp_value_copy( guid_orig_value );
     g_assert( guid_copy_value );
     g_assert( guid_copy_value != guid_orig_value );
@@ -528,31 +528,31 @@
     guid_copy = kvp_value_get_guid( guid_copy_value );
     g_assert( guid_orig != guid_copy );
     g_assert( guid_equal( guid_orig, guid_copy ) );
-    
+
     timespec_copy_value = kvp_value_copy( timespec_orig_value );
     g_assert( timespec_copy_value );
     g_assert( timespec_copy_value != timespec_orig_value );
     g_assert( kvp_value_get_type( timespec_copy_value ) == KVP_TYPE_TIMESPEC );
     ts_copy = kvp_value_get_timespec( timespec_copy_value );
-    g_assert_cmpfloat( ts_copy.tv_sec, ==, ts_orig.tv_sec );
-    g_assert_cmpfloat( ts_copy.tv_nsec, ==, ts_orig.tv_nsec );
-    
+    g_assert_cmpfloat( ts_copy.tv_sec, == , ts_orig.tv_sec );
+    g_assert_cmpfloat( ts_copy.tv_nsec, == , ts_orig.tv_nsec );
+
     glist_copy_value = kvp_value_copy( glist_orig_value );
     g_assert( glist_copy_value );
     g_assert( glist_copy_value != glist_orig_value );
     g_assert( kvp_value_get_type( glist_copy_value ) == KVP_TYPE_GLIST );
     list_copy = kvp_value_get_glist( glist_copy_value );
     g_assert( list_copy != list_orig );
-    g_assert_cmpint( g_list_length( list_copy ), ==, g_list_length( list_orig ) );
-    g_assert_cmpint( kvp_glist_compare( list_orig, list_copy ), ==, 0 );
-    
+    g_assert_cmpint( g_list_length( list_copy ), == , g_list_length( list_orig ) );
+    g_assert_cmpint( kvp_glist_compare( list_orig, list_copy ), == , 0 );
+
     frame_copy_value = kvp_value_copy( frame_orig_value );
     g_assert( frame_copy_value );
     g_assert( frame_copy_value != frame_orig_value );
     g_assert( kvp_value_get_type( frame_copy_value ) == KVP_TYPE_FRAME );
     frame_copy = kvp_value_get_frame( frame_copy_value );
-    g_assert_cmpint( kvp_frame_compare( frame_orig, frame_copy ), ==, 0 );
-    
+    g_assert_cmpint( kvp_frame_compare( frame_orig, frame_copy ), == , 0 );
+
     /* destroy objects */
     kvp_value_delete( gint64_orig_value );
     kvp_value_delete( double_orig_value );
@@ -562,7 +562,7 @@
     kvp_value_delete( timespec_orig_value );
     kvp_value_delete( glist_orig_value );
     kvp_value_delete( frame_orig_value );
-    
+
     kvp_value_delete( gint64_copy_value );
     kvp_value_delete( double_copy_value );
     kvp_value_delete( numeric_copy_value );
@@ -585,13 +585,13 @@
     KvpValue *timespec_value;
     KvpValue *glist_value;
     KvpValue *frame_value;
-    
+
     gnc_numeric gnc_numeric_orig;
     GncGUID *guid_orig;
     Timespec ts_orig;
     GList *list_orig;
     KvpFrame *frame_orig;
-    
+
     gnc_numeric_orig = gnc_numeric_zero();
     guid_orig = guid_malloc();
     guid_new( guid_orig );
@@ -600,7 +600,7 @@
     list_orig = NULL;
     list_orig = g_list_append( list_orig, kvp_value_new_string( "abcdefghijklmnop" ) );
     frame_orig = kvp_frame_new();
-    
+
     gint64_value = kvp_value_new_gint64( 2 );
     double_value = kvp_value_new_double( 3.3 );
     numeric_value = kvp_value_new_gnc_numeric( gnc_numeric_orig );
@@ -609,7 +609,7 @@
     timespec_value = kvp_value_new_timespec( ts_orig );
     glist_value = kvp_value_new_glist( list_orig );
     frame_value = kvp_value_new_frame( frame_orig );
-    
+
     value_list = g_list_append( value_list, gint64_value );
     value_list = g_list_append( value_list, double_value );
     value_list = g_list_append( value_list, numeric_value );
@@ -619,26 +619,26 @@
     value_list = g_list_append( value_list, glist_value );
     value_list = g_list_append( value_list, frame_value );
     g_assert( value_list );
-    g_assert_cmpint( g_list_length( value_list ), ==, 8 );
-    
+    g_assert_cmpint( g_list_length( value_list ), == , 8 );
+
     g_test_message( "Test list and all values are copied to new list" );
     copy_list = kvp_glist_copy( value_list );
     g_assert( copy_list );
     g_assert( copy_list != value_list );
-    g_assert_cmpint( g_list_length( copy_list ), ==, 8 );
+    g_assert_cmpint( g_list_length( copy_list ), == , 8 );
     lp1 = value_list;
     lp2 = copy_list;
     while (lp1 && lp2)
     {
         KvpValue *v1 = (KvpValue *) lp1->data;
         KvpValue *v2 = (KvpValue *) lp2->data;
-	g_assert( v1 != v2 );
-        g_assert_cmpint( kvp_value_compare(v1, v2), ==, 0 );
+        g_assert( v1 != v2 );
+        g_assert_cmpint( kvp_value_compare(v1, v2), == , 0 );
         lp1 = lp1->next;
         lp2 = lp2->next;
     }
-    g_assert_cmpint( kvp_glist_compare( value_list, copy_list ), ==, 0 );
-    
+    g_assert_cmpint( kvp_glist_compare( value_list, copy_list ), == , 0 );
+
     /* destroy */
     kvp_glist_delete( value_list );
     kvp_glist_delete( copy_list );
@@ -648,7 +648,7 @@
 test_kvp_glist_compare( void )
 {
     GList *list1 = NULL, *list2 = NULL;
-    
+
     KvpValue *gint64_value;
     KvpValue *double_value;
     KvpValue *numeric_value;
@@ -657,13 +657,13 @@
     KvpValue *timespec_value;
     KvpValue *glist_value;
     KvpValue *frame_value;
-    
+
     gnc_numeric gnc_numeric_orig;
     GncGUID *guid_orig;
     Timespec ts_orig;
     GList *list_orig;
     KvpFrame *frame_orig;
-    
+
     gnc_numeric_orig = gnc_numeric_zero();
     guid_orig = guid_malloc();
     guid_new( guid_orig );
@@ -672,7 +672,7 @@
     list_orig = NULL;
     list_orig = g_list_append( list_orig, kvp_value_new_string( "abcdefghijklmnop" ) );
     frame_orig = kvp_frame_new();
-    
+
     gint64_value = kvp_value_new_gint64( 2 );
     double_value = kvp_value_new_double( 3.3 );
     numeric_value = kvp_value_new_gnc_numeric( gnc_numeric_orig );
@@ -681,7 +681,7 @@
     timespec_value = kvp_value_new_timespec( ts_orig );
     glist_value = kvp_value_new_glist( list_orig );
     frame_value = kvp_value_new_frame( frame_orig );
-    
+
     /* init list 1 */
     list1 = g_list_append( list1, gint64_value );
     list1 = g_list_append( list1, double_value );
@@ -692,46 +692,46 @@
     list1 = g_list_append( list1, glist_value );
     list1 = g_list_append( list1, frame_value );
     g_assert( list1 );
-    g_assert_cmpint( g_list_length( list1 ), ==, 8 );
-    
+    g_assert_cmpint( g_list_length( list1 ), == , 8 );
+
     g_test_message( "Test when list is the same" );
     list2 = list1;
-    g_assert_cmpint( kvp_glist_compare( list1, list2 ), ==, 0 );
-    
+    g_assert_cmpint( kvp_glist_compare( list1, list2 ), == , 0 );
+
     g_test_message( "Test when list1 is null" );
-    g_assert_cmpint( kvp_glist_compare( NULL, list2 ), ==, -1 );
+    g_assert_cmpint( kvp_glist_compare( NULL, list2 ), == , -1 );
 
     g_test_message( "Test when list2 is null" );
-    g_assert_cmpint( kvp_glist_compare( list1, NULL ), ==, 1 );
-    
+    g_assert_cmpint( kvp_glist_compare( list1, NULL ), == , 1 );
+
     g_test_message( "Copy list and test they are equal" );
     list2 = kvp_glist_copy( list1 );
     g_assert( list1 != list2 );
-    g_assert_cmpint( g_list_length( list1 ), ==, g_list_length( list2 ) );
-    g_assert_cmpint( kvp_glist_compare( list1, list2 ), ==, 0 );
-    
+    g_assert_cmpint( g_list_length( list1 ), == , g_list_length( list2 ) );
+    g_assert_cmpint( kvp_glist_compare( list1, list2 ), == , 0 );
+
     g_test_message( "Test when list 1 is shorter lists are not equal" );
     list1 = g_list_remove( list1, frame_value );
-    g_assert_cmpint( g_list_length( list1 ), ==, 7 );
-    g_assert_cmpint( g_list_length( list2 ), ==, 8 );
-    g_assert_cmpint( kvp_glist_compare( list1, list2 ), ==, -1 );
-    
+    g_assert_cmpint( g_list_length( list1 ), == , 7 );
+    g_assert_cmpint( g_list_length( list2 ), == , 8 );
+    g_assert_cmpint( kvp_glist_compare( list1, list2 ), == , -1 );
+
     g_test_message( "Test when list 2 is shorter lists are not equal" );
     list1 = g_list_append( list1, frame_value );
     list1 = g_list_append( list1, frame_value );
-    g_assert_cmpint( g_list_length( list1 ), ==, 9 );
-    g_assert_cmpint( g_list_length( list2 ), ==, 8 );
-    g_assert_cmpint( kvp_glist_compare( list1, list2 ), ==, 1 );
-    
+    g_assert_cmpint( g_list_length( list1 ), == , 9 );
+    g_assert_cmpint( g_list_length( list2 ), == , 8 );
+    g_assert_cmpint( kvp_glist_compare( list1, list2 ), == , 1 );
+
     g_test_message( "Test when data is not equal lists are not equal" );
     list1 = g_list_remove( list1, frame_value );
-    g_assert_cmpint( g_list_length( list1 ), ==, g_list_length( list2 ) );
-    g_assert_cmpint( kvp_glist_compare( list1, list2 ), ==, 0 );
+    g_assert_cmpint( g_list_length( list1 ), == , g_list_length( list2 ) );
+    g_assert_cmpint( kvp_glist_compare( list1, list2 ), == , 0 );
     list1 = g_list_remove( list1, gint64_value );
     kvp_value_delete( gint64_value );
     list1 = g_list_prepend( list1, kvp_value_new_gint64( 5 ) );
-    g_assert_cmpint( g_list_length( list1 ), ==, g_list_length( list2 ) );
-    g_assert_cmpint( kvp_glist_compare( list1, list2 ), !=, 0 );
+    g_assert_cmpint( g_list_length( list1 ), == , g_list_length( list2 ) );
+    g_assert_cmpint( kvp_glist_compare( list1, list2 ), != , 0 );
 
     /* delete lists */
     kvp_glist_delete( list1 );
@@ -749,14 +749,14 @@
     KvpValue *timespec_orig_value, *timespec_copy_value;
     KvpValue *glist_orig_value, *glist_copy_value;
     KvpValue *frame_orig_value, *frame_copy_value;
-    
+
     /* data init */
     gnc_numeric gnc_numeric_orig, gnc_numeric_copy;
     GncGUID *guid_orig, *guid_copy;
     Timespec ts_orig, ts_copy;
     GList *list_orig, *list_copy;
     KvpFrame *frame_orig, *frame_copy;
-    
+
     gnc_numeric_orig = gnc_numeric_zero();
     gnc_numeric_copy = gnc_numeric_zero();
     guid_orig = guid_malloc();
@@ -773,7 +773,7 @@
     list_copy = g_list_append( list_copy, kvp_value_new_string( "abcdefg" ) );
     frame_orig = kvp_frame_new();
     frame_copy = kvp_frame_new();
-    
+
     gint64_orig_value = kvp_value_new_gint64( 2 );
     gint64_copy_value = kvp_value_new_gint64( 5 );
     double_orig_value = kvp_value_new_double( 3.3 );
@@ -790,36 +790,36 @@
     glist_copy_value = kvp_value_new_glist( list_copy );
     frame_orig_value = kvp_value_new_frame( frame_orig );
     frame_copy_value = kvp_value_new_frame( frame_copy );
-    
+
     g_test_message( "Test the same kvpvalue is equal" );
-    g_assert_cmpint( kvp_value_compare( gint64_orig_value, gint64_orig_value ), ==, 0 );
-    
+    g_assert_cmpint( kvp_value_compare( gint64_orig_value, gint64_orig_value ), == , 0 );
+
     g_test_message( "Test first value is null" );
-    g_assert_cmpint( kvp_value_compare( NULL, gint64_orig_value ), ==, -1 );
-    
+    g_assert_cmpint( kvp_value_compare( NULL, gint64_orig_value ), == , -1 );
+
     g_test_message( "Test second value is null" );
-    g_assert_cmpint( kvp_value_compare( gint64_orig_value, NULL ), ==, 1 );
-    
+    g_assert_cmpint( kvp_value_compare( gint64_orig_value, NULL ), == , 1 );
+
     g_test_message( "Test diffrent data types first is lesser" );
-    g_assert_cmpint( kvp_value_compare( gint64_orig_value, double_orig_value ), ==, -1 );
-    
+    g_assert_cmpint( kvp_value_compare( gint64_orig_value, double_orig_value ), == , -1 );
+
     g_test_message( "Test diffrent data types second is lesser" );
-    g_assert_cmpint( kvp_value_compare( double_orig_value, gint64_orig_value ), ==, 1 );
-    
+    g_assert_cmpint( kvp_value_compare( double_orig_value, gint64_orig_value ), == , 1 );
+
     /* testing all different cases of data equality is not the aim
      * of this test. Rather we check that all data types are being compared.
      */
     g_test_message( "Test different kvpvalues of all the types" );
-    g_assert_cmpint( kvp_value_compare( gint64_orig_value, gint64_copy_value ), ==, -1 );
-    g_assert_cmpint( kvp_value_compare( gint64_copy_value, gint64_orig_value ), ==, 1 );
-    g_assert_cmpint( kvp_value_compare( double_orig_value, double_copy_value ), ==, double_compare( 3.3, 3.5 ) );
-    g_assert_cmpint( kvp_value_compare( numeric_orig_value, numeric_copy_value ), ==, gnc_numeric_compare( gnc_numeric_orig, gnc_numeric_copy ) );
-    g_assert_cmpint( kvp_value_compare( string_orig_value, string_copy_value ), ==, strcmp( "abcdefghijklmnop", "abcdefghijklmnop" ) );
-    g_assert_cmpint( kvp_value_compare( guid_orig_value, guid_copy_value ), ==, guid_compare( guid_orig, guid_copy ) );
-    g_assert_cmpint( kvp_value_compare( timespec_orig_value, timespec_copy_value ), ==, timespec_cmp( &ts_orig, &ts_copy ) );
-    g_assert_cmpint( kvp_value_compare( glist_orig_value, glist_copy_value ), ==, kvp_glist_compare( list_orig, list_copy ) );
-    g_assert_cmpint( kvp_value_compare( frame_orig_value, frame_copy_value ), ==, kvp_frame_compare( frame_orig, frame_copy ) );
-    
+    g_assert_cmpint( kvp_value_compare( gint64_orig_value, gint64_copy_value ), == , -1 );
+    g_assert_cmpint( kvp_value_compare( gint64_copy_value, gint64_orig_value ), == , 1 );
+    g_assert_cmpint( kvp_value_compare( double_orig_value, double_copy_value ), == , double_compare( 3.3, 3.5 ) );
+    g_assert_cmpint( kvp_value_compare( numeric_orig_value, numeric_copy_value ), == , gnc_numeric_compare( gnc_numeric_orig, gnc_numeric_copy ) );
+    g_assert_cmpint( kvp_value_compare( string_orig_value, string_copy_value ), == , strcmp( "abcdefghijklmnop", "abcdefghijklmnop" ) );
+    g_assert_cmpint( kvp_value_compare( guid_orig_value, guid_copy_value ), == , guid_compare( guid_orig, guid_copy ) );
+    g_assert_cmpint( kvp_value_compare( timespec_orig_value, timespec_copy_value ), == , timespec_cmp( &ts_orig, &ts_copy ) );
+    g_assert_cmpint( kvp_value_compare( glist_orig_value, glist_copy_value ), == , kvp_glist_compare( list_orig, list_copy ) );
+    g_assert_cmpint( kvp_value_compare( frame_orig_value, frame_copy_value ), == , kvp_frame_compare( frame_orig, frame_copy ) );
+
     /* destroy objects */
     kvp_value_delete( gint64_orig_value );
     kvp_value_delete( double_orig_value );
@@ -829,7 +829,7 @@
     kvp_value_delete( timespec_orig_value );
     kvp_value_delete( glist_orig_value );
     kvp_value_delete( frame_orig_value );
-    
+
     kvp_value_delete( gint64_copy_value );
     kvp_value_delete( double_copy_value );
     kvp_value_delete( numeric_copy_value );
@@ -848,7 +848,7 @@
     guint64 size;
     GList *list = NULL;
     KvpFrame *frame = NULL;
-    
+
     g_test_message( "Test new binary values are not copied" );
     val = g_new0( char, 5 );
     size = sizeof( val );
@@ -856,22 +856,22 @@
     g_assert( binary_value_nc );
     g_assert( kvp_value_get_type( binary_value_nc ) == KVP_TYPE_BINARY );
     g_assert( kvp_value_get_binary( binary_value_nc, &size ) == val );
-    
+
     g_test_message( "Test new glist is not copied" );
     list = g_list_append( list, kvp_value_new_gint64( 2 ) );
-    g_assert_cmpint( g_list_length( list ), ==, 1 );
+    g_assert_cmpint( g_list_length( list ), == , 1 );
     glist_value_nc = kvp_value_new_glist_nc( list );
     g_assert( glist_value_nc );
     g_assert( kvp_value_get_type( glist_value_nc ) == KVP_TYPE_GLIST );
     g_assert( kvp_value_get_glist( glist_value_nc ) == list );
-    
+
     g_test_message( "Test new frame is not copied" );
     frame = kvp_frame_new();
     frame_value_nc = kvp_value_new_frame_nc( frame );
     g_assert( frame_value_nc );
     g_assert( kvp_value_get_type( frame_value_nc ) == KVP_TYPE_FRAME );
     g_assert( kvp_value_get_frame( frame_value_nc ) == frame );
-    
+
     kvp_value_delete( binary_value_nc );
     kvp_value_delete( glist_value_nc );
     kvp_value_delete( frame_value_nc );
@@ -881,47 +881,47 @@
 test_kvp_frame_compare( Fixture *fixture, gconstpointer pData )
 {
     KvpFrame *cmp_frame = NULL;
-    
+
     cmp_frame = kvp_frame_new();
     g_assert( cmp_frame );
-    
+
     g_test_message( "Test the same frame is equal with itself" );
-    g_assert_cmpint( kvp_frame_compare( fixture->frame, fixture->frame ), ==, 0 );
-    
+    g_assert_cmpint( kvp_frame_compare( fixture->frame, fixture->frame ), == , 0 );
+
     g_test_message( "Test first frame null second not null" );
-    g_assert_cmpint( kvp_frame_compare( NULL, fixture->frame ), ==, -1 );
-    
+    g_assert_cmpint( kvp_frame_compare( NULL, fixture->frame ), == , -1 );
+
     g_test_message( "Test first frame not null second null" );
-    g_assert_cmpint( kvp_frame_compare( fixture->frame, NULL ), ==, 1 );
-    
+    g_assert_cmpint( kvp_frame_compare( fixture->frame, NULL ), == , 1 );
+
     g_test_message( "Test first frame is empty second not empty" );
     kvp_frame_set_gint64( fixture->frame, "/test/test2", 64 );
     g_assert( !kvp_frame_is_empty( fixture->frame ) );
     g_assert( kvp_frame_is_empty( cmp_frame ) );
-    g_assert_cmpint( kvp_frame_compare( cmp_frame, fixture->frame ), ==, -1 );
-    
+    g_assert_cmpint( kvp_frame_compare( cmp_frame, fixture->frame ), == , -1 );
+
     g_test_message( "Test first frame is not empty second is empty" );
-    g_assert_cmpint( kvp_frame_compare( fixture->frame, cmp_frame ), ==, 1 );
-    
+    g_assert_cmpint( kvp_frame_compare( fixture->frame, cmp_frame ), == , 1 );
+
     g_test_message( "Test when frames are equal" );
     kvp_frame_set_gint64( cmp_frame, "/test/test2", 64 );
     g_assert( !kvp_frame_is_empty( cmp_frame ) );
-    g_assert_cmpint( kvp_frame_compare( fixture->frame, cmp_frame ), ==, 0 );
-    
+    g_assert_cmpint( kvp_frame_compare( fixture->frame, cmp_frame ), == , 0 );
+
     g_test_message( "Test when frames have equal data but second frame has additional slot set" );
     kvp_frame_set_string( fixture->frame, "/test/test3", "abcdefghijklmnop" );
-    g_assert_cmpint( kvp_frame_compare( cmp_frame, fixture->frame ), ==, -1 );
-    
+    g_assert_cmpint( kvp_frame_compare( cmp_frame, fixture->frame ), == , -1 );
+
     g_test_message( "Test when frames have equal data but first frame has additional slot set" );
-    g_assert_cmpint( kvp_frame_compare( fixture->frame, cmp_frame ), ==, 1 );
-    
+    g_assert_cmpint( kvp_frame_compare( fixture->frame, cmp_frame ), == , 1 );
+
     g_test_message( "Test when frames have equal number of slots second frame has different data in one slot" );
     kvp_frame_set_string( cmp_frame, "/test/test3", "abcdefg" );
-    g_assert_cmpint( kvp_frame_compare( cmp_frame, fixture->frame ), <, 0 );
-    
+    g_assert_cmpint( kvp_frame_compare( cmp_frame, fixture->frame ), < , 0 );
+
     g_test_message( "Test when frames have equal number of slots second frame has different data in one slot" );
-    g_assert_cmpint( kvp_frame_compare( fixture->frame, cmp_frame ), >, 0 );
-    
+    g_assert_cmpint( kvp_frame_compare( fixture->frame, cmp_frame ), > , 0 );
+
     kvp_frame_delete( cmp_frame );
 }
 
@@ -938,11 +938,11 @@
     val[2] = (guchar) 10;
     val[3] = (guchar) 255;
     val[4] = (guchar) 256;
-    
+
     result = binary_to_string( val, size );
     g_assert( result );
-    g_assert_cmpstr( result, ==, "00090aff00" );
-    
+    g_assert_cmpstr( result, == , "00090aff00" );
+
     g_free( val );
     g_free( result );
 }
@@ -961,13 +961,13 @@
     KvpValue *timespec_value;
     KvpValue *glist_value;
     KvpValue *frame_value;
-    
+
     gnc_numeric gnc_numeric_orig;
     GncGUID *guid_orig;
     Timespec ts_orig;
     GList *list_orig;
     KvpFrame *frame_orig;
-    
+
     gnc_numeric_orig = gnc_numeric_zero();
     guid_orig = guid_malloc();
     guid_new( guid_orig );
@@ -976,7 +976,7 @@
     list_orig = NULL;
     list_orig = g_list_append( list_orig, kvp_value_new_string( "abcdefghijklmnop" ) );
     frame_orig = kvp_frame_new();
-    
+
     gint64_value = kvp_value_new_gint64( 2 );
     double_value = kvp_value_new_double( 3.3 );
     numeric_value = kvp_value_new_gnc_numeric( gnc_numeric_orig );
@@ -985,56 +985,56 @@
     timespec_value = kvp_value_new_timespec( ts_orig );
     glist_value = kvp_value_new_glist( list_orig );
     frame_value = kvp_value_new_frame( frame_orig );
-    
+
     g_test_message( "Test value string representation with different data types" );
     result = kvp_value_to_string( gint64_value );
     g_assert( result );
-    g_assert_cmpstr( result, ==, "KVP_VALUE_GINT64(2)" );
+    g_assert_cmpstr( result, == , "KVP_VALUE_GINT64(2)" );
     g_free( result );
-    
+
     result = kvp_value_to_string( double_value );
     g_assert( result );
-    g_assert_cmpstr( result, ==, "KVP_VALUE_DOUBLE(3.3)" );
+    g_assert_cmpstr( result, == , "KVP_VALUE_DOUBLE(3.3)" );
     g_free( result );
-    
+
     result = kvp_value_to_string( numeric_value );
     g_assert( result );
-    g_assert_cmpstr( result, ==, "KVP_VALUE_NUMERIC(0/1)" );
+    g_assert_cmpstr( result, == , "KVP_VALUE_NUMERIC(0/1)" );
     g_free( result );
-    
+
     result = kvp_value_to_string( string_value );
     g_assert( result );
-    g_assert_cmpstr( result, ==, "KVP_VALUE_STRING(abcdefghijklmnop)" );
+    g_assert_cmpstr( result, == , "KVP_VALUE_STRING(abcdefghijklmnop)" );
     g_free( result );
-    
+
     result = kvp_value_to_string( guid_value );
     g_assert( result );
     str_tmp = guid_to_string( kvp_value_get_guid( guid_value ) );
-    str_tmp2 = g_strdup_printf("KVP_VALUE_GUID(%s)", str_tmp ? str_tmp : "");    
-    g_assert_cmpstr( result, ==, str_tmp2 );
+    str_tmp2 = g_strdup_printf("KVP_VALUE_GUID(%s)", str_tmp ? str_tmp : "");
+    g_assert_cmpstr( result, == , str_tmp2 );
     g_free( result );
     g_free( str_tmp2 );
-    
+
     result = kvp_value_to_string( timespec_value );
     g_assert( result );
     str_tmp2 = g_new0 (char, 40);
     gnc_timespec_to_iso8601_buff( kvp_value_get_timespec( timespec_value ), str_tmp2 );
     str_tmp3 = g_strdup_printf("KVP_VALUE_TIMESPEC(%s)", str_tmp2);
-    g_assert_cmpstr( result, ==, str_tmp3 );    
+    g_assert_cmpstr( result, == , str_tmp3 );
     g_free( result );
     g_free( str_tmp2 );
     g_free( str_tmp3 );
-    
+
     result = kvp_value_to_string( glist_value );
     g_assert( result );
-    g_assert_cmpstr( result, ==, "KVP_VALUE_GLIST([  KVP_VALUE_STRING(abcdefghijklmnop), ])" );
+    g_assert_cmpstr( result, == , "KVP_VALUE_GLIST([  KVP_VALUE_STRING(abcdefghijklmnop), ])" );
     g_free( result );
-    
+
     result = kvp_value_to_string( frame_value );
     g_assert( result );
-    g_assert_cmpstr( result, ==, "KVP_VALUE_FRAME({\n}\n)" );
+    g_assert_cmpstr( result, == , "KVP_VALUE_FRAME({\n}\n)" );
     g_free( result );
-    
+
     kvp_value_delete( gint64_value );
     kvp_value_delete( double_value );
     kvp_value_delete( numeric_value );
@@ -1053,22 +1053,22 @@
     GncGUID *test_guid;
     Timespec test_ts;
     KvpFrame *test_frame;
-    
+
     test_gnc_numeric = gnc_numeric_zero();
     test_guid = guid_malloc();
     guid_new( test_guid );
     test_ts.tv_sec = 1;
     test_ts.tv_nsec = 1;
     test_frame = kvp_frame_new();
-    
+
     g_assert( fixture->frame );
     g_assert( kvp_frame_is_empty( fixture->frame ) );
-    
+
     g_test_message( "Test empty frame" );
     result = kvp_frame_to_string( fixture->frame );
-    g_assert_cmpstr( result, ==, "{\n}\n" );
+    g_assert_cmpstr( result, == , "{\n}\n" );
     g_free( result );
-    
+
     /* slots can be randomly distributed in hash table
      * instead of checking the whole return string we rather check if certain entries exist in it
      */
@@ -1077,32 +1077,32 @@
     result = kvp_frame_to_string( fixture->frame );
     g_assert( g_strrstr( result, "    gint64-type => KVP_VALUE_GINT64(2),\n" ) != NULL );
     g_free( result );
-    
+
     kvp_frame_set_double( fixture->frame, "/double-type", 3.3 );
     result = kvp_frame_to_string( fixture->frame );
     g_assert( g_strrstr( result, "    double-type => KVP_VALUE_DOUBLE(3.3),\n" ) != NULL );
     g_free( result );
-    
+
     kvp_frame_set_numeric( fixture->frame, "/numeric-type", test_gnc_numeric );
     result = kvp_frame_to_string( fixture->frame );
     g_assert( g_strrstr( result, "    numeric-type => KVP_VALUE_NUMERIC(0/1),\n" ) != NULL );
     g_free( result );
-    
+
     kvp_frame_set_timespec( fixture->frame, "/timespec-type", test_ts );
     result = kvp_frame_to_string( fixture->frame );
     g_assert( g_strrstr( result, "    timespec-type => KVP_VALUE_TIMESPEC" ) != NULL );
     g_free( result );
-    
+
     kvp_frame_set_string( fixture->frame, "/string-type", "abcdefghijklmnop" );
     result = kvp_frame_to_string( fixture->frame );
     g_assert( g_strrstr( result, "    string-type => KVP_VALUE_STRING(abcdefghijklmnop),\n" ) != NULL );
     g_free( result );
-    
+
     kvp_frame_set_guid( fixture->frame, "/guid-type", test_guid );
     result = kvp_frame_to_string( fixture->frame );
     g_assert( g_strrstr( result, "    guid-type => KVP_VALUE_GUID" ) != NULL );
     g_free( result );
-    
+
     kvp_frame_set_frame( fixture->frame, "/nested/frame-type", test_frame );
     result = kvp_frame_to_string( fixture->frame );
     g_assert( g_strrstr( result, "    nested => KVP_VALUE_FRAME({\n    frame-type => KVP_VALUE_FRAME({\n}\n),\n}\n),\n" ) != NULL );
@@ -1114,39 +1114,39 @@
 {
     GHashTable *frame_hash = NULL;
     KvpValue *input_value, *output_value;
-    
+
     g_assert( fixture->frame );
     g_assert( kvp_frame_is_empty( fixture->frame ) );
-    
+
     g_test_message( "Test with a simple value added to the empty frame" );
     input_value = kvp_value_new_gint64( 2 );
     kvp_frame_set_slot_path( fixture->frame, input_value, "test", NULL );
     output_value = kvp_frame_get_slot_path( fixture->frame, "test", NULL );
     g_assert( output_value );
     g_assert( input_value != output_value ); /* copied */
-    g_assert_cmpint( kvp_value_compare( output_value, input_value ), ==, 0 );
+    g_assert_cmpint( kvp_value_compare( output_value, input_value ), == , 0 );
     kvp_value_delete( input_value );
-    
+
     g_test_message( "Test when value is being replaced" );
     input_value = kvp_value_new_double( 3.3 );
     kvp_frame_set_slot_path( fixture->frame, input_value, "test", NULL );
     output_value = kvp_frame_get_slot_path( fixture->frame, "test", NULL );
     g_assert( output_value );
     g_assert( input_value != output_value ); /* copied */
-    g_assert_cmpint( kvp_value_compare( output_value, input_value ), ==, 0 );/* old value removed */
+    g_assert_cmpint( kvp_value_compare( output_value, input_value ), == , 0 ); /* old value removed */
     frame_hash = kvp_frame_get_hash( fixture->frame );
     g_assert( frame_hash );
-    g_assert_cmpint( g_hash_table_size( frame_hash ), ==, 1 ); /* be sure it was replaced */
+    g_assert_cmpint( g_hash_table_size( frame_hash ), == , 1 ); /* be sure it was replaced */
     kvp_value_delete( input_value );
-    
+
     g_test_message( "Test when existing path elements are not frames" );
     input_value = kvp_value_new_string( "abcdefghijklmnop" );
     kvp_frame_set_slot_path( fixture->frame, input_value, "test", "test2", NULL );
     g_assert( kvp_frame_get_slot_path( fixture->frame, "test2", NULL ) == NULL );/* was not added */
-    g_assert_cmpint( kvp_value_compare( output_value, kvp_frame_get_slot_path( fixture->frame, "test", NULL ) ), ==, 0 ); /* nothing changed */
-    g_assert_cmpint( g_hash_table_size( frame_hash ), ==, 1 ); /* didn't change */
+    g_assert_cmpint( kvp_value_compare( output_value, kvp_frame_get_slot_path( fixture->frame, "test", NULL ) ), == , 0 ); /* nothing changed */
+    g_assert_cmpint( g_hash_table_size( frame_hash ), == , 1 ); /* didn't change */
     kvp_value_delete( input_value );
-    
+
     g_test_message( "Test frames are created along the path when needed" );
     input_value = kvp_value_new_string( "abcdefghijklmnop" );
     kvp_frame_set_slot_path( fixture->frame, input_value, "test2", "test3", NULL );
@@ -1156,8 +1156,8 @@
     output_value = kvp_frame_get_slot_path( fixture->frame, "test2", "test3", NULL );
     g_assert( output_value );
     g_assert( input_value != output_value ); /* copied */
-    g_assert_cmpint( kvp_value_compare( output_value, input_value ), ==, 0 );
-    g_assert_cmpint( g_hash_table_size( frame_hash ), ==, 2 ); 
+    g_assert_cmpint( kvp_value_compare( output_value, input_value ), == , 0 );
+    g_assert_cmpint( g_hash_table_size( frame_hash ), == , 2 );
     kvp_value_delete( input_value );
 }
 
@@ -1168,10 +1168,10 @@
     GSList *path_list = NULL;
     GHashTable *frame_hash = NULL;
     KvpValue *input_value, *output_value;
-    
+
     g_assert( fixture->frame );
     g_assert( kvp_frame_is_empty( fixture->frame ) );
-    
+
     g_test_message( "Test with a simple value added to the empty frame" );
     path_list = g_slist_append( path_list, "test" );
     input_value = kvp_value_new_gint64( 2 );
@@ -1179,30 +1179,30 @@
     output_value = kvp_frame_get_slot_path( fixture->frame, "test", NULL );
     g_assert( output_value );
     g_assert( input_value != output_value ); /* copied */
-    g_assert_cmpint( kvp_value_compare( output_value, input_value ), ==, 0 );
+    g_assert_cmpint( kvp_value_compare( output_value, input_value ), == , 0 );
     kvp_value_delete( input_value );
-    
+
     g_test_message( "Test when value is being replaced" );
     input_value = kvp_value_new_double( 3.3 );
     kvp_frame_set_slot_path_gslist( fixture->frame, input_value, path_list );
     output_value = kvp_frame_get_slot_path( fixture->frame, "test", NULL );
     g_assert( output_value );
     g_assert( input_value != output_value ); /* copied */
-    g_assert_cmpint( kvp_value_compare( output_value, input_value ), ==, 0 );/* old value removed */
+    g_assert_cmpint( kvp_value_compare( output_value, input_value ), == , 0 ); /* old value removed */
     frame_hash = kvp_frame_get_hash( fixture->frame );
     g_assert( frame_hash );
-    g_assert_cmpint( g_hash_table_size( frame_hash ), ==, 1 ); /* be sure it was replaced */
+    g_assert_cmpint( g_hash_table_size( frame_hash ), == , 1 ); /* be sure it was replaced */
     kvp_value_delete( input_value );
-    
+
     g_test_message( "Test when existing path elements are not frames" );
     path_list = g_slist_append( path_list, "test2");
     input_value = kvp_value_new_string( "abcdefghijklmnop" );
     kvp_frame_set_slot_path_gslist( fixture->frame, input_value, path_list );
     g_assert( kvp_frame_get_slot_path( fixture->frame, "test2", NULL ) == NULL );/* was not added */
-    g_assert_cmpint( kvp_value_compare( output_value, kvp_frame_get_slot_path( fixture->frame, "test", NULL ) ), ==, 0 ); /* nothing changed */
-    g_assert_cmpint( g_hash_table_size( frame_hash ), ==, 1 ); /* didn't change */
+    g_assert_cmpint( kvp_value_compare( output_value, kvp_frame_get_slot_path( fixture->frame, "test", NULL ) ), == , 0 ); /* nothing changed */
+    g_assert_cmpint( g_hash_table_size( frame_hash ), == , 1 ); /* didn't change */
     kvp_value_delete( input_value );
-    
+
     g_test_message( "Test frames are created along the path when needed" );
     path_list = g_slist_remove( path_list, "test" );
     path_list = g_slist_append( path_list, "test3");
@@ -1214,10 +1214,10 @@
     output_value = kvp_frame_get_slot_path( fixture->frame, "test2", "test3", NULL );
     g_assert( output_value );
     g_assert( input_value != output_value ); /* copied */
-    g_assert_cmpint( kvp_value_compare( output_value, input_value ), ==, 0 );
-    g_assert_cmpint( g_hash_table_size( frame_hash ), ==, 2 ); 
+    g_assert_cmpint( kvp_value_compare( output_value, input_value ), == , 0 );
+    g_assert_cmpint( g_hash_table_size( frame_hash ), == , 2 );
     kvp_value_delete( input_value );
-    
+
     g_slist_free( path_list );
 }
 
@@ -1229,29 +1229,29 @@
     /* test indirectly static function kvp_frame_replace_slot_nc */
     g_assert( fixture->frame );
     g_assert( kvp_frame_is_empty( fixture->frame ) );
-    
+
     g_test_message( "Test when new value is created frame hash init and value stored in hash" );
     orig_value = kvp_value_new_gint64( 2 );
     kvp_frame_set_slot( fixture->frame, "test", orig_value );
     g_assert( !kvp_frame_is_empty( fixture->frame ) );
     frame_hash = kvp_frame_get_hash( fixture->frame );
     g_assert( frame_hash );
-    g_assert_cmpint( g_hash_table_size( frame_hash ), ==, 1 );
+    g_assert_cmpint( g_hash_table_size( frame_hash ), == , 1 );
     copy_value = g_hash_table_lookup( frame_hash, "test" );
     g_assert( orig_value != copy_value );
-    g_assert_cmpint( kvp_value_compare( orig_value, copy_value ), ==, 0 );
-    
+    g_assert_cmpint( kvp_value_compare( orig_value, copy_value ), == , 0 );
+
     g_test_message( "Test when value is replaced" );
     orig_value2 = kvp_value_new_gint64( 5 );
     kvp_frame_set_slot( fixture->frame, "test", orig_value2 );
     frame_hash = kvp_frame_get_hash( fixture->frame );
     g_assert( frame_hash );
-    g_assert_cmpint( g_hash_table_size( frame_hash ), ==, 1 );
+    g_assert_cmpint( g_hash_table_size( frame_hash ), == , 1 );
     copy_value = g_hash_table_lookup( frame_hash, "test" );
     g_assert( orig_value2 != copy_value );
-    g_assert_cmpint( kvp_value_compare( orig_value2, copy_value ), ==, 0 );
-    g_assert_cmpint( kvp_value_compare( orig_value, copy_value ), !=, 0 );
-    
+    g_assert_cmpint( kvp_value_compare( orig_value2, copy_value ), == , 0 );
+    g_assert_cmpint( kvp_value_compare( orig_value, copy_value ), != , 0 );
+
     kvp_value_delete( orig_value );
     kvp_value_delete( orig_value2 );
 }
@@ -1262,7 +1262,7 @@
     char *last_key = NULL;
     KvpValue *frame_value = NULL;
     KvpFrame *frame = NULL, *frame2 = NULL;
-    
+
     g_test_message( "Test null frame and empty string checks" );
     g_assert( p_get_trailer_make( NULL, "test", &last_key ) == NULL );
     g_assert( !last_key );
@@ -1270,21 +1270,21 @@
     g_assert( !last_key );
     g_assert( p_get_trailer_make( fixture->frame, "", &last_key ) == NULL );
     g_assert( !last_key );
-    
+
     g_test_message( "Test single frame on the path with no slash" );
     g_assert( p_get_trailer_make( fixture->frame, "test", &last_key ) == fixture->frame );
-    g_assert_cmpstr( last_key, ==, "test" );
-    
+    g_assert_cmpstr( last_key, == , "test" );
+
     g_test_message( "Test single frame on the path with slash" );
     last_key = NULL;
     g_assert( p_get_trailer_make( fixture->frame, "/test", &last_key ) == fixture->frame );
-    g_assert_cmpstr( last_key, ==, "test" );
-    
+    g_assert_cmpstr( last_key, == , "test" );
+
     g_test_message( "Test path of trailing slash" );
     last_key = NULL;
     g_assert( p_get_trailer_make( fixture->frame, "test/", &last_key ) == NULL );
     g_assert( !last_key );
-    
+
     g_test_message( "Test path of two entries: frame for test should be created" );
     /* test is considered to be last frame on the path
      * and it is returned. Currently it doesn't exist and will be created
@@ -1299,15 +1299,15 @@
     g_assert( kvp_value_get_frame( frame_value ) == frame );
     frame_value = kvp_frame_get_slot( frame, "test2" );
     g_assert( !frame_value );
-    g_assert_cmpstr( last_key, ==, "test2" );
-    
+    g_assert_cmpstr( last_key, == , "test2" );
+
     g_test_message( "Test path of two entries: test frame already exist" );
     /* here test frame already exist and should be returned
      */
     last_key = NULL;
     g_assert( frame == p_get_trailer_make( fixture->frame, "/test/test2", &last_key ) );
-    g_assert_cmpstr( last_key, ==, "test2" );
-    
+    g_assert_cmpstr( last_key, == , "test2" );
+
     g_test_message( "Test path of three entries: neither frame exist" );
     /* test3 and test4 frames will be created. test4 will be created inside test3 frame
      * while test3 inside fixture->frame. test4 will be returned
@@ -1327,7 +1327,7 @@
     g_assert( kvp_value_get_frame( frame_value ) == frame );
     frame_value = kvp_frame_get_slot( frame, "test5" );
     g_assert( !frame_value );
-    g_assert_cmpstr( last_key, ==, "test5" );
+    g_assert_cmpstr( last_key, == , "test5" );
 }
 
 static void
@@ -1338,21 +1338,21 @@
      */
     GList *value_list = NULL;
     gchar *result;
-    
+
     gnc_numeric gnc_numeric_orig;
     GList *list_orig;
     KvpFrame *frame_orig;
-    
+
     gnc_numeric_orig = gnc_numeric_zero();
     list_orig = NULL;
     list_orig = g_list_append( list_orig, kvp_value_new_string( "abcdefghijklmnop" ) );
     frame_orig = kvp_frame_new();
-        
+
     g_test_message( "Test empty list" );
     result = p_kvp_value_glist_to_string( value_list );
-    g_assert_cmpstr( result, ==, "[  ]" );
+    g_assert_cmpstr( result, == , "[  ]" );
     g_free( result );
-    
+
     g_test_message( "Test list with simple and complex values" );
     value_list = g_list_append( value_list, kvp_value_new_gint64( 2 ) );
     value_list = g_list_append( value_list, kvp_value_new_double( 3.3 ) );
@@ -1361,12 +1361,12 @@
     value_list = g_list_append( value_list, kvp_value_new_glist( list_orig ) );
     value_list = g_list_append( value_list, kvp_value_new_frame( frame_orig ) );
     g_assert( value_list );
-    g_assert_cmpint( g_list_length( value_list ), ==, 6 );
+    g_assert_cmpint( g_list_length( value_list ), == , 6 );
     result = p_kvp_value_glist_to_string( value_list );
-    
-    g_assert_cmpstr( result, ==, "[  KVP_VALUE_GINT64(2), KVP_VALUE_DOUBLE(3.3), KVP_VALUE_NUMERIC(0/1), KVP_VALUE_STRING(abcdefghijklmnop), KVP_VALUE_GLIST([  KVP_VALUE_STRING(abcdefghijklmnop), ]), KVP_VALUE_FRAME({\n}\n), ]" );
+
+    g_assert_cmpstr( result, == , "[  KVP_VALUE_GINT64(2), KVP_VALUE_DOUBLE(3.3), KVP_VALUE_NUMERIC(0/1), KVP_VALUE_STRING(abcdefghijklmnop), KVP_VALUE_GLIST([  KVP_VALUE_STRING(abcdefghijklmnop), ]), KVP_VALUE_FRAME({\n}\n), ]" );
     g_free( result );
-    
+
     kvp_glist_delete( value_list );
 }
 
@@ -1374,10 +1374,10 @@
 test_get_or_make( Fixture *fixture, gconstpointer pData )
 {
     KvpFrame *test_frame = NULL;
-    
+
     g_assert( fixture->frame );
     g_assert( kvp_frame_is_empty( fixture->frame ) );
-    
+
     g_test_message( "Test new frame is created" );
     test_frame = p_get_or_make( fixture->frame, "test" );
     g_assert( test_frame );
@@ -1386,7 +1386,7 @@
 
     g_test_message( "Test existing frame is returned" );
     g_assert( test_frame == p_get_or_make( fixture->frame, "test" ) );
-    g_assert( kvp_frame_get_frame( fixture->frame, "test" ) == test_frame );  
+    g_assert( kvp_frame_get_frame( fixture->frame, "test" ) == test_frame );
 }
 
 static void
@@ -1395,18 +1395,18 @@
     g_test_message( "Test null checks" );
     g_assert( p_kvp_frame_get_frame_or_null_slash_trash( NULL, "test" ) == NULL );
     g_assert( p_kvp_frame_get_frame_or_null_slash_trash( fixture->frame, NULL ) == NULL );
-    
+
     g_test_message( "Test single slash and trailing slash path" );
     g_assert( p_kvp_frame_get_frame_or_null_slash_trash( fixture->frame, "/" ) == fixture->frame );
     g_assert( p_kvp_frame_get_frame_or_null_slash_trash( fixture->frame, "////" ) == fixture->frame );
-    
+
     g_test_message( "Test non existing path" );
     g_assert( p_kvp_frame_get_frame_or_null_slash_trash( fixture->frame, "/test" ) == NULL );
-    
+
     g_test_message( "Test existing path when value is not frame" );
     kvp_frame_set_gint64( fixture->frame, "/test", 2 );
     g_assert( p_kvp_frame_get_frame_or_null_slash_trash( fixture->frame, "/test" ) == NULL );
-    
+
     g_test_message( "Test existing path when value is frame" );
     kvp_frame_set_frame( fixture->frame, "/test2", kvp_frame_new() );
     g_assert( p_kvp_frame_get_frame_or_null_slash_trash( fixture->frame, "/test2" ) != NULL );
@@ -1418,7 +1418,7 @@
     char *last_key = NULL;
     KvpFrame *frame = NULL;
     const KvpFrame* frame2 = NULL;
-    
+
     g_test_message( "Test null frame and empty string checks" );
     g_assert( p_get_trailer_or_null( NULL, "test", &last_key ) == NULL );
     g_assert( !last_key );
@@ -1426,33 +1426,33 @@
     g_assert( !last_key );
     g_assert( p_get_trailer_or_null( fixture->frame, "", &last_key ) == NULL );
     g_assert( !last_key );
-    
+
     g_test_message( "Test single frame on the path with no slash" );
     g_assert( p_get_trailer_or_null( fixture->frame, "test", &last_key ) == fixture->frame );
-    g_assert_cmpstr( last_key, ==, "test" );
-    
+    g_assert_cmpstr( last_key, == , "test" );
+
     g_test_message( "Test single frame on the path with slash" );
     last_key = NULL;
     g_assert( p_get_trailer_or_null( fixture->frame, "/test", &last_key ) == fixture->frame );
-    g_assert_cmpstr( last_key, ==, "test" );
-    
+    g_assert_cmpstr( last_key, == , "test" );
+
     g_test_message( "Test path of trailing slash" );
     last_key = NULL;
     g_assert( p_get_trailer_or_null( fixture->frame, "test/", &last_key ) == NULL );
     g_assert( !last_key );
-    
+
     g_test_message( "Test with non existing path" );
     last_key = NULL;
     g_assert( p_get_trailer_or_null( fixture->frame, "/test/test2", &last_key ) == NULL );
-    g_assert_cmpstr( last_key, ==, "test2" );
-    
+    g_assert_cmpstr( last_key, == , "test2" );
+
     g_test_message( "Test with existing path" );
     last_key = NULL;
     frame = kvp_frame_new();
     kvp_frame_set_frame( fixture->frame, "/test/test2", frame );
     frame2 = p_get_trailer_or_null( fixture->frame, "/test/test2", &last_key );
     g_assert( kvp_frame_get_frame( fixture->frame, "/test") == frame2 );
-    g_assert_cmpstr( last_key, ==, "test2" );
+    g_assert_cmpstr( last_key, == , "test2" );
 }
 
 void

Modified: gnucash/trunk/src/libqof/qof/test/test-qofbook.c
===================================================================
--- gnucash/trunk/src/libqof/qof/test/test-qofbook.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/libqof/qof/test/test-qofbook.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -91,9 +91,9 @@
     g_assert( col );
     g_assert( user_data == col_struct.data );
     if ( g_strcmp0( qof_collection_get_type(col), "my_type" ) == 0 )
-	col_struct.col1_called = TRUE;
+        col_struct.col1_called = TRUE;
     else if ( g_strcmp0( qof_collection_get_type(col), "my_type2" ) == 0 )
-	col_struct.col2_called = TRUE;
+        col_struct.col2_called = TRUE;
 }
 
 /* mock final callback function */
@@ -104,8 +104,8 @@
     g_assert( book );
     g_assert( QOF_IS_BOOK( book ) );
     g_test_message( "Checking parameters" );
-    g_assert_cmpstr( (gchar*)key, ==, "key" );
-    g_assert_cmpstr( (gchar*)user_data, ==, "data" );
+    g_assert_cmpstr( (gchar*)key, == , "key" );
+    g_assert_cmpstr( (gchar*)user_data, == , "data" );
 }
 
 static void
@@ -185,8 +185,8 @@
     const char *opt_name_notset = "Not Set";
     g_assert( fixture->book != NULL );
     qof_book_set_string_option( fixture->book, opt_name, opt_value);
-    g_assert_cmpstr( qof_book_get_string_option( fixture->book, opt_name ), ==, opt_value);
-    g_assert_cmpstr( qof_book_get_string_option( fixture->book, opt_name_notset ), ==, NULL );
+    g_assert_cmpstr( qof_book_get_string_option( fixture->book, opt_name ), == , opt_value);
+    g_assert_cmpstr( qof_book_get_string_option( fixture->book, opt_name_notset ), == , NULL );
 }
 
 static void
@@ -218,7 +218,7 @@
 test_book_mark_saved( Fixture *fixture, gconstpointer pData )
 {
     time_t dirty_time, clean_time;
-    
+
     qof_book_mark_dirty( fixture-> book );
     g_assert( qof_book_not_saved( fixture->book ) );
     dirty_time = qof_book_get_dirty_time( fixture->book );
@@ -236,31 +236,31 @@
     const char *err_no_book = "No book";
     const char *err_invalid_cnt = "Invalid counter name";
     gint64 counter;
-    
+
     /* need this as long as we have fatal warnings enabled */
     g_test_log_set_fatal_handler ( ( GTestLogFatalFunc )handle_faults, NULL );
-    
+
     counter = qof_book_get_counter( NULL, counter_name );
-    g_assert_cmpint( counter, ==, -1 );
+    g_assert_cmpint( counter, == , -1 );
     g_assert( g_strrstr( test_struct.msg, err_no_book ) != NULL );
     g_free( test_struct.msg );
-    
+
     counter = qof_book_get_counter( fixture->book, NULL );
-    g_assert_cmpint( counter, ==, -1 );
+    g_assert_cmpint( counter, == , -1 );
     g_assert( g_strrstr( test_struct.msg, err_invalid_cnt ) != NULL );
     g_free( test_struct.msg );
-    
+
     counter = qof_book_get_counter( fixture->book, '\0' );
-    g_assert_cmpint( counter, ==, -1 );
+    g_assert_cmpint( counter, == , -1 );
     g_assert( g_strrstr( test_struct.msg, err_invalid_cnt ) != NULL );
     g_free( test_struct.msg );
-    
+
     counter = qof_book_get_counter( fixture->book, counter_name );
-    g_assert_cmpint( counter, ==, 0 );
-    
+    g_assert_cmpint( counter, == , 0 );
+
     qof_book_increment_and_format_counter( fixture->book, counter_name );
     counter = qof_book_get_counter( fixture->book, counter_name );
-    g_assert_cmpint( counter, ==, 1 );
+    g_assert_cmpint( counter, == , 1 );
 }
 
 static void
@@ -272,36 +272,36 @@
     const char *err_invalid_cnt = "Invalid counter name";
     gchar *r;
     gint64 counter;
-    
+
     /* need this as long as we have fatal warnings enabled */
     g_test_log_set_fatal_handler ( ( GTestLogFatalFunc )handle_faults, NULL );
-    
+
     g_test_message( "Testing counter format when book is null" );
     r = qof_book_get_counter_format( NULL, counter_name );
-    g_assert_cmpstr( r, ==, NULL );
+    g_assert_cmpstr( r, == , NULL );
     g_assert( g_strrstr( test_struct.msg, err_no_book ) != NULL );
-    g_free( test_struct.msg );    
-    
+    g_free( test_struct.msg );
+
     g_test_message( "Testing counter format when counter name is null" );
     r = qof_book_get_counter_format( fixture->book, NULL );
-    g_assert_cmpstr( r, ==, NULL );
+    g_assert_cmpstr( r, == , NULL );
     g_assert( g_strrstr( test_struct.msg, err_invalid_cnt ) != NULL );
     g_free( test_struct.msg );
-    
+
     g_test_message( "Testing counter format when counter name is empty string" );
     r = qof_book_get_counter_format( fixture->book, '\0' );
-    g_assert_cmpstr( r, ==, NULL );
+    g_assert_cmpstr( r, == , NULL );
     g_assert( g_strrstr( test_struct.msg, err_invalid_cnt ) != NULL );
     g_free( test_struct.msg );
-    
+
     g_test_message( "Testing counter format with existing counter" );
     counter = qof_book_get_counter( fixture->book, counter_name );
     r = qof_book_get_counter_format( fixture->book, counter_name );
-    g_assert_cmpstr( r, ==, "%.6" G_GINT64_FORMAT);
-    
+    g_assert_cmpstr( r, == , "%.6" G_GINT64_FORMAT);
+
     g_test_message( "Testing counter format for default value" );
     r = qof_book_get_counter_format( fixture->book, counter_name );
-    g_assert_cmpstr( r, ==, "%.6" G_GINT64_FORMAT);
+    g_assert_cmpstr( r, == , "%.6" G_GINT64_FORMAT);
 }
 
 static void
@@ -313,46 +313,46 @@
     gchar *format;
     gchar *r;
     gint64 counter;
-    
+
     /* need this as long as we have fatal warnings enabled */
     g_test_log_set_fatal_handler ( ( GTestLogFatalFunc )handle_faults, NULL );
-    
+
     g_test_message( "Testing increment and format when book is null" );
     r = qof_book_increment_and_format_counter( NULL, counter_name );
-    g_assert_cmpstr( r, ==, NULL );
+    g_assert_cmpstr( r, == , NULL );
     g_free( r );
     g_assert( g_strrstr( test_struct.msg, err_no_book ) != NULL );
     g_free( test_struct.msg );
-    
+
     g_test_message( "Testing increment and format when counter name is null" );
     r = qof_book_increment_and_format_counter( fixture->book, NULL );
-    g_assert_cmpstr( r, ==, NULL );
+    g_assert_cmpstr( r, == , NULL );
     g_free( r );
     g_assert( g_strrstr( test_struct.msg, err_invalid_cnt ) != NULL );
     g_free( test_struct.msg );
-    
+
     g_test_message( "Testing increment and format when counter name is empty string" );
     r = qof_book_increment_and_format_counter( fixture->book, '\0' );
-    g_assert_cmpstr( r, ==, NULL );
+    g_assert_cmpstr( r, == , NULL );
     g_free( r );
     g_assert( g_strrstr( test_struct.msg, err_invalid_cnt ) != NULL );
     g_free( test_struct.msg );
-    
+
     g_test_message( "Testing increment and format with new counter" );
     r = qof_book_increment_and_format_counter( fixture->book, counter_name );
     counter = qof_book_get_counter( fixture->book, counter_name );
     format = qof_book_get_counter_format( fixture->book, counter_name );
-    g_assert_cmpint( counter, ==, 1 );
+    g_assert_cmpint( counter, == , 1 );
     g_assert( qof_book_not_saved( fixture->book ) );
-    g_assert_cmpstr( r, ==, g_strdup_printf( format, counter ));
+    g_assert_cmpstr( r, == , g_strdup_printf( format, counter ));
     g_free( r );
-    
+
     g_test_message( "Testing increment and format with existing counter" );
     r = qof_book_increment_and_format_counter( fixture->book, counter_name );
     counter = qof_book_get_counter( fixture->book, counter_name );
     format = qof_book_get_counter_format( fixture->book, counter_name );
-    g_assert_cmpint( counter, ==, 2 );
-    g_assert_cmpstr( r, ==, g_strdup_printf( format, counter ));
+    g_assert_cmpint( counter, == , 2 );
+    g_assert_cmpstr( r, == , g_strdup_printf( format, counter ));
     g_free( r );
 }
 
@@ -369,26 +369,26 @@
 test_book_use_trading_accounts( Fixture *fixture, gconstpointer pData )
 {
     const char *slot_path;
-    
+
     /* create correct slot path */
     slot_path = (const char *) g_strconcat( KVP_OPTION_PATH, "/", OPTION_SECTION_ACCOUNTS, "/", OPTION_NAME_TRADING_ACCOUNTS, NULL );
     g_assert( slot_path != NULL );
-  
+
     g_test_message( "Testing when no trading accounts are used" );
     g_assert( qof_book_use_trading_accounts( fixture-> book ) == FALSE );
-    
+
     g_test_message( "Testing with incorrect slot path and correct value - t" );
     qof_book_set_string_option( fixture->book, OPTION_NAME_TRADING_ACCOUNTS, "t" );
     g_assert( qof_book_use_trading_accounts( fixture-> book ) == FALSE );
-    
+
     g_test_message( "Testing with existing trading accounts set to true - t" );
     qof_book_set_string_option( fixture->book, slot_path, "t" );
     g_assert( qof_book_use_trading_accounts( fixture-> book ) == TRUE );
-    
+
     g_test_message( "Testing with existing trading accounts and incorrect value - tt" );
     qof_book_set_string_option( fixture->book, slot_path, "tt" );
     g_assert( qof_book_use_trading_accounts( fixture-> book ) == FALSE );
-    
+
 }
 
 static void
@@ -397,22 +397,22 @@
     QofBook *_empty = NULL;
     time_t before, after;
     guint param = (guint) g_test_rand_int();
-  
+
     g_test_message( "Testing when book is NULL" );
     qof_book_mark_dirty( _empty );
     g_assert( _empty == NULL );
-    
+
     g_test_message( "Testing when book is not dirty and dirty_cb is null" );
-    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), ==, 0);
+    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), == , 0);
     g_assert( fixture->book->dirty_cb == NULL );
     g_assert( qof_book_not_saved( fixture->book ) == FALSE );
     before = time( NULL );
     qof_book_mark_dirty( fixture->book );
     after = time( NULL );
-    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), >=, before);
-    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), <=, after);
+    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), >= , before);
+    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), <= , after);
     g_assert( qof_book_not_saved( fixture->book ) == TRUE );
-    
+
     g_test_message( "Testing when book is not dirty and dirty_cb is not null" );
     /* prepare conditions */
     qof_book_mark_saved( fixture->book );
@@ -420,59 +420,59 @@
     test_struct.data = (gpointer) (&param);
     test_struct.called = FALSE;
     g_assert( fixture->book->dirty_cb != NULL );
-    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), ==, 0);
+    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), == , 0);
     g_assert( qof_book_not_saved( fixture->book ) == FALSE );
     /* run FUT */
     before = time( NULL );
     qof_book_mark_dirty( fixture->book );
     after = time( NULL );
     /* test output */
-    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), >=, before);
-    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), <=, after);
+    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), >= , before);
+    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), <= , after);
     g_assert( qof_book_not_saved( fixture->book ) == TRUE );
     g_assert( test_struct.called );
-    
+
     g_test_message( "Testing when book is dirty" );
     g_assert( qof_book_not_saved( fixture->book ) == TRUE );
     before = qof_book_get_dirty_time( fixture->book );
     qof_book_mark_dirty( fixture->book );
     g_assert( qof_book_not_saved( fixture->book ) == TRUE );
     after = qof_book_get_dirty_time( fixture->book );
-    g_assert_cmpint( before, ==, after );
+    g_assert_cmpint( before, == , after );
 }
 
 static void
 test_book_get_dirty_time( Fixture *fixture, gconstpointer pData )
 {
     time_t before, after;
-    
+
     g_test_message( "Testing time on saved book = 0" );
     g_assert( qof_book_not_saved( fixture->book ) == FALSE );
-    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), ==, 0);
-    
+    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), == , 0);
+
     g_test_message( "Testing time on dirty book is correct" );
     before = time( NULL );
     qof_book_mark_dirty( fixture->book );
     after = time( NULL );
-    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), >=, before);
-    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), <=, after);
-    
+    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), >= , before);
+    g_assert_cmpint( qof_book_get_dirty_time( fixture->book ), <= , after);
+
 }
 
 static void
 test_book_set_dirty_cb( Fixture *fixture, gconstpointer pData )
 {
     const char * error_msg = "Already existing callback";
-    
+
     g_test_message( "Testing when callback is previously not set" );
     g_assert( fixture->book->dirty_cb == NULL );
     qof_book_set_dirty_cb( fixture->book, mock_dirty_cb, (gpointer) (&test_struct) );
     g_assert( fixture->book->dirty_cb == mock_dirty_cb );
     g_assert( fixture->book->dirty_data == &test_struct );
-    
+
     /* need this as long as we have fatal warnings enabled */
     g_test_log_set_fatal_handler ( ( GTestLogFatalFunc )handle_faults, NULL );
-    
+
     g_test_message( "Testing when callback was previously set" );
     g_assert( fixture->book->dirty_cb != NULL );
     qof_book_set_dirty_cb( fixture->book, NULL, NULL );
@@ -500,23 +500,23 @@
 {
     const char *key = "key";
     const char *data = "data";
-    
+
     g_assert( fixture->book->data_tables != NULL );
     g_test_message( "Testing when book is null" );
     qof_book_set_data( NULL, key, (gpointer) data );
     g_assert( qof_book_get_data( NULL, key ) == NULL );
-    
+
     g_test_message( "Testing when key is null" );
     qof_book_set_data( fixture->book, NULL, (gpointer) data );
     g_assert( qof_book_get_data( fixture->book, NULL) == NULL );
-    
+
     g_test_message( "Testing with book key not null, data null" );
     qof_book_set_data( fixture->book, key, NULL );
     g_assert( qof_book_get_data( fixture->book, key ) == NULL );
-    
+
     g_test_message( "Testing with book key data not null" );
     qof_book_set_data( fixture->book, key, (gpointer) data );
-    g_assert_cmpstr( (const char *)qof_book_get_data( fixture->book, key ), ==, data );
+    g_assert_cmpstr( (const char *)qof_book_get_data( fixture->book, key ), == , data );
 }
 
 static void
@@ -524,19 +524,19 @@
 {
     QofIdType my_type = "my type";
     QofCollection *m_col, *m_col2;
-    
+
     g_test_message( "Testing when book is null" );
     g_assert( qof_book_get_collection( NULL, my_type ) == NULL );
-    
+
     g_test_message( "Testing when entity type is null" );
     g_assert( qof_book_get_collection( fixture->book, NULL ) == NULL );
-    
+
     g_test_message( "Testing when collection does not exist" );
     g_assert( fixture->book->hash_of_collections != NULL );
     g_assert( g_hash_table_lookup ( fixture->book->hash_of_collections, my_type ) == NULL );
     m_col = qof_book_get_collection( fixture->book, my_type );
     g_assert( m_col != NULL );
-    
+
     g_test_message( "Testing with existing collection" );
     g_assert( g_hash_table_lookup ( fixture->book->hash_of_collections, my_type ) != NULL );
     m_col2 = qof_book_get_collection( fixture->book, my_type );
@@ -550,10 +550,10 @@
     QofCollection *m_col, *m_col2;
     QofIdType my_type = "my_type", my_type2 = "my_type2";
     guint param = (guint) g_test_rand_int();
-    
+
     /* need this as long as we have fatal warnings enabled */
     g_test_log_set_fatal_handler ( ( GTestLogFatalFunc )handle_faults, NULL );
-    
+
     g_test_message( "Testing when book is null" );
     m_col = qof_book_get_collection( fixture->book, my_type );
     m_col2 = qof_book_get_collection( fixture->book, my_type2 );
@@ -564,17 +564,17 @@
     qof_book_foreach_collection( NULL, mock_foreach_collection, (gpointer)(&param) );
     g_assert( !col_struct.col1_called );
     g_assert( !col_struct.col2_called );
-    g_assert_cmpstr( test_struct.msg, ==, "qof_book_foreach_collection: assertion `book' failed" );
+    g_assert_cmpstr( test_struct.msg, == , "qof_book_foreach_collection: assertion `book' failed" );
     g_free( test_struct.msg );
-    
+
     g_test_message( "Testing when cb is null" );
     /* launching with empty cb should still fail and produce warning */
     qof_book_foreach_collection( fixture->book, NULL, (gpointer)(&param) );
     g_assert( !col_struct.col1_called );
     g_assert( !col_struct.col2_called );
-    g_assert_cmpstr( test_struct.msg, ==, "qof_book_foreach_collection: assertion `cb' failed" );
+    g_assert_cmpstr( test_struct.msg, == , "qof_book_foreach_collection: assertion `cb' failed" );
     g_free( test_struct.msg );
-    
+
     g_test_message( "Testing when book and cb not null, user_data provided" );
     /* both cols have to be called */
     qof_book_foreach_collection( fixture->book, mock_foreach_collection, (gpointer)(&param) );
@@ -588,39 +588,39 @@
     QofBook *book;
     const char *key = "key";
     const char *data = "data";
-    
+
     /* init */
     book = qof_book_new();
-    g_assert_cmpint( g_hash_table_size( book->data_tables ), ==, 0 );
-    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), ==, 0 );
-    
+    g_assert_cmpint( g_hash_table_size( book->data_tables ), == , 0 );
+    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), == , 0 );
+
     g_test_message( "Testing when book is null" );
     qof_book_set_data_fin( NULL, key, (gpointer) data, mock_final_cb );
     /* assert nothing was set */
-    g_assert_cmpint( g_hash_table_size( book->data_tables ), ==, 0 );
-    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), ==, 0 );
-    
+    g_assert_cmpint( g_hash_table_size( book->data_tables ), == , 0 );
+    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), == , 0 );
+
     g_test_message( "Testing when key is null" );
     qof_book_set_data_fin( book, NULL, (gpointer) data, mock_final_cb );
     /* nothing set as well */
-    g_assert_cmpint( g_hash_table_size( book->data_tables ), ==, 0 );
-    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), ==, 0 );
-    
+    g_assert_cmpint( g_hash_table_size( book->data_tables ), == , 0 );
+    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), == , 0 );
+
     g_test_message( "Testing with book key not null, cb null" );
     qof_book_set_data_fin( book, key, (gpointer) data, NULL );
     /* now data is set cb not set */
-    g_assert_cmpint( g_hash_table_size( book->data_tables ), ==, 1 );
-    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), ==, 0 );
-    g_assert_cmpstr( (const char *)qof_book_get_data( book, key ), ==, data );
-    
+    g_assert_cmpint( g_hash_table_size( book->data_tables ), == , 1 );
+    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), == , 0 );
+    g_assert_cmpstr( (const char *)qof_book_get_data( book, key ), == , data );
+
     g_test_message( "Testing with all data set" );
     qof_book_set_data_fin( book, key, (gpointer) data, mock_final_cb );
     /* now we have all set */
-    g_assert_cmpint( g_hash_table_size( book->data_tables ), ==, 1 );
-    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), ==, 1 );
-    g_assert_cmpstr( (const char *)qof_book_get_data( book, key ), ==, data );
+    g_assert_cmpint( g_hash_table_size( book->data_tables ), == , 1 );
+    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), == , 1 );
+    g_assert_cmpstr( (const char *)qof_book_get_data( book, key ), == , data );
     g_assert( g_hash_table_lookup ( book->data_table_finalizers, (gpointer)key ) == mock_final_cb );
-    
+
     /* get rid of book make sure final cb is called */
     test_struct.called = FALSE;
     qof_book_destroy( book );
@@ -631,13 +631,13 @@
 test_book_mark_closed( Fixture *fixture, gconstpointer pData )
 {
     g_test_message( "Testing when book is null" );
-    g_assert_cmpstr( &fixture->book->book_open, ==, "y" );
+    g_assert_cmpstr( &fixture->book->book_open, == , "y" );
     qof_book_mark_closed( NULL );
-    g_assert_cmpstr( &fixture->book->book_open, ==, "y" );
-    
+    g_assert_cmpstr( &fixture->book->book_open, == , "y" );
+
     g_test_message( "Testing when book is not null" );
     qof_book_mark_closed( fixture->book );
-    g_assert_cmpstr( &fixture->book->book_open, ==, "n" ); 
+    g_assert_cmpstr( &fixture->book->book_open, == , "n" );
 }
 
 static void
@@ -646,28 +646,28 @@
     QofBook *book;
     const char *key = "key";
     const char *data = "data";
-        
+
     g_test_message( "Testing book creation and initial setup" );
     book = qof_book_new();
     g_assert( book );
     g_assert( QOF_IS_BOOK( book ) );
-    
+
     g_test_message( "Testing book initial setup" );
     g_assert( book->hash_of_collections );
     g_assert( book->data_tables );
     g_assert( book->data_table_finalizers );
-    g_assert_cmpint( g_hash_table_size( book->hash_of_collections ), ==, 1 );
+    g_assert_cmpint( g_hash_table_size( book->hash_of_collections ), == , 1 );
     g_assert( g_hash_table_lookup ( book->hash_of_collections, QOF_ID_BOOK ) != NULL );
-    g_assert_cmpint( g_hash_table_size( book->data_tables ), ==, 0 );
-    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), ==, 0 );
-    g_assert_cmpstr( &book->book_open, ==, "y");
+    g_assert_cmpint( g_hash_table_size( book->data_tables ), == , 0 );
+    g_assert_cmpint( g_hash_table_size( book->data_table_finalizers ), == , 0 );
+    g_assert_cmpstr( &book->book_open, == , "y");
     g_assert( !book->read_only );
-    g_assert_cmpint( book->version, ==, 0 );
-    
+    g_assert_cmpint( book->version, == , 0 );
+
     /* set finalizer */
     qof_book_set_data_fin( book, key, (gpointer) data, mock_final_cb );
     test_struct.called = FALSE;
-    
+
     g_test_message( "Testing book destroy" );
     qof_book_destroy( book );
     g_assert( qof_book_shutting_down( book ) );

Modified: gnucash/trunk/src/libqof/qof/test/test-qofinstance.c
===================================================================
--- gnucash/trunk/src/libqof/qof/test/test-qofinstance.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/libqof/qof/test/test-qofinstance.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -37,10 +37,10 @@
 
 /* use g_free on error_message after this function been called */
 static gboolean
-fatal_handler ( const char * log_domain, 
-		GLogLevelFlags log_level, 
-		const gchar *msg, 
-		gpointer user_data)
+fatal_handler ( const char * log_domain,
+                GLogLevelFlags log_level,
+                const gchar *msg,
+                gpointer user_data)
 {
     error_message = (gchar *) g_strdup( msg );
     return FALSE;
@@ -62,19 +62,19 @@
 test_instance_set_get_book( Fixture *fixture, gconstpointer pData )
 {
     QofBook *book;
-    
+
     /* set up */
     book = qof_book_new();
-    
+
     g_assert( QOF_IS_INSTANCE( fixture->inst ) );
-    
+
     g_test_message( "Setting and getting book" );
     qof_instance_set_book( fixture->inst, book );
     g_assert( book == qof_instance_get_book( fixture->inst ) );
-    
+
     g_test_message( "Getting book when instance is null" );
     g_assert( qof_instance_get_book( NULL ) == NULL );
-    
+
     /* Clean up */
     qof_book_destroy( book );
 }
@@ -83,19 +83,19 @@
 test_instance_set_get_guid( Fixture *fixture, gconstpointer pData )
 {
     GncGUID *gncGuid;
-    
+
     /* on null instance deprecated getter returns empty guid
      * while instance_get_guid returns null
      */
     g_assert( !qof_instance_get_guid( NULL ) );
     g_assert( qof_entity_get_guid( NULL ) == guid_null() );
-    
+
     /* set up */
     gncGuid = guid_malloc();
     guid_new( gncGuid );
     g_assert( QOF_IS_INSTANCE( fixture->inst ) );
     g_assert( gncGuid );
-    
+
     /* guid already exists after instance init */
     g_test_message( "Setting new guid" );
     g_assert( qof_instance_get_guid( fixture->inst ) );
@@ -103,7 +103,7 @@
     qof_instance_set_guid( fixture->inst, gncGuid );
     g_assert( guid_equal( gncGuid, qof_instance_get_guid( fixture->inst ) ) );
     g_assert( guid_equal( gncGuid, qof_entity_get_guid( fixture->inst ) ) );
-    
+
     /* Clean up */
     guid_free( gncGuid );
 }
@@ -132,16 +132,16 @@
     g_assert( qof_instance_get_book( inst ) == NULL );
     g_assert( inst->kvp_data );
     g_object_get( inst, "last-update", &timespec_priv, NULL);
-    g_assert_cmpint( timespec_priv->tv_sec, ==, 0 );
-    g_assert_cmpint( timespec_priv->tv_nsec, ==, -1 );
-    g_assert_cmpint( qof_instance_get_editlevel( inst ), ==, 0 );
+    g_assert_cmpint( timespec_priv->tv_sec, == , 0 );
+    g_assert_cmpint( timespec_priv->tv_nsec, == , -1 );
+    g_assert_cmpint( qof_instance_get_editlevel( inst ), == , 0 );
     g_assert( !qof_instance_get_destroying( inst ) );
     g_assert( !qof_instance_get_dirty_flag( inst ) );
     g_assert( qof_instance_get_infant( inst ) );
-    g_assert_cmpint( qof_instance_get_version( inst ), ==, 0 );
-    g_assert_cmpint( qof_instance_get_version_check( inst ), ==, 0 );
-    g_assert_cmpint( qof_instance_get_idata( inst ), ==, 0 );
-    
+    g_assert_cmpint( qof_instance_get_version( inst ), == , 0 );
+    g_assert_cmpint( qof_instance_get_version_check( inst ), == , 0 );
+    g_assert_cmpint( qof_instance_get_idata( inst ), == , 0 );
+
     g_test_message( "Testing object destruction" );
     g_object_unref( inst );
     /* test fields were deinitialized */
@@ -152,15 +152,15 @@
     g_assert( qof_instance_get_collection( inst ) == NULL );
     g_assert( g_strrstr( error_message, "assertion `QOF_IS_INSTANCE(ptr)' failed" ) != NULL );
     g_free( error_message );
-    
-    g_assert_cmpint( qof_instance_get_editlevel( inst ), ==, 0 );
+
+    g_assert_cmpint( qof_instance_get_editlevel( inst ), == , 0 );
     g_assert( g_strrstr( error_message, "assertion `QOF_IS_INSTANCE(ptr)' failed" ) != NULL );
     g_free( error_message );
-    
+
     g_assert( !qof_instance_get_destroying( inst ) );
     g_assert( g_strrstr( error_message, "assertion `QOF_IS_INSTANCE(ptr)' failed" ) != NULL );
     g_free( error_message );
-    
+
     g_assert( !qof_instance_get_dirty_flag( inst ) );
     g_assert( g_strrstr( error_message, "assertion `QOF_IS_INSTANCE(ptr)' failed" ) != NULL );
     g_free( error_message );
@@ -176,7 +176,7 @@
     const GncGUID *gncguid;
     char guid_id_before[GUID_ENCODING_LENGTH + 1];
     char guid_id_after[GUID_ENCODING_LENGTH + 1];
-    
+
     /* set up */
     inst = g_object_new( QOF_TYPE_INSTANCE, NULL );
     g_assert( QOF_IS_INSTANCE( inst ) );
@@ -184,7 +184,7 @@
     g_assert( QOF_IS_BOOK( book ) );
     /* set fatal handler */
     g_test_log_set_fatal_handler ( ( GTestLogFatalFunc )fatal_handler, NULL );
-    
+
     g_test_message( "Running test with correct initial data" );
     gncguid = qof_instance_get_guid( inst );
     g_assert( gncguid );
@@ -193,17 +193,17 @@
     g_assert( qof_instance_get_collection( inst ) == NULL );
     /* run init */
     qof_instance_init_data( inst, test_type, book );
-    
+
     g_assert( qof_instance_get_book( inst ) == book );
     guid_to_string_buff( gncguid, guid_id_after );
-    g_assert_cmpstr( guid_id_before, !=, guid_id_after );
+    g_assert_cmpstr( guid_id_before, != , guid_id_after );
     g_assert( qof_instance_get_collection( inst ) != NULL );
     col = qof_book_get_collection( book, test_type );
     g_assert( col );
     g_assert( col == qof_instance_get_collection( inst ) );
-    g_assert_cmpstr( inst->e_type, ==, test_type );
+    g_assert_cmpstr( inst->e_type, == , test_type );
     g_assert( qof_collection_lookup_entity( qof_instance_get_collection( inst ), gncguid ) == inst );
-        
+
     /* clean up */
     g_object_unref( inst );
     qof_book_destroy( book );
@@ -213,12 +213,12 @@
 test_instance_get_set_slots( Fixture *fixture, gconstpointer pData )
 {
     KvpFrame *kvp_frame, *kvp_frame2;
-    
+
     /* set up */
     g_assert( fixture->inst );
     kvp_frame = qof_instance_get_slots( fixture->inst );
     g_assert( kvp_frame );
-    
+
     g_test_message( "Test when kvp frame is the same" );
     qof_instance_set_slots( fixture->inst, kvp_frame );
     g_assert( kvp_frame == qof_instance_get_slots( fixture->inst ) );
@@ -230,12 +230,12 @@
     qof_instance_set_slots( fixture->inst, kvp_frame2 );
     g_assert( kvp_frame2 == qof_instance_get_slots( fixture->inst ) );
     g_assert( qof_instance_get_dirty_flag( fixture->inst ) );
-    
+
     g_test_message( "Test when kvp frame is null" );
     qof_instance_set_slots( fixture->inst, NULL );
     g_assert( NULL == qof_instance_get_slots( fixture->inst ) );
     g_assert( qof_instance_get_dirty_flag( fixture->inst ) );
-    
+
 }
 
 static void
@@ -244,39 +244,39 @@
     QofInstance *left, *right;
     int result;
     Timespec timespec_left, timespec_right;
-    
+
     /* set up*/
     left = g_object_new( QOF_TYPE_INSTANCE, NULL );
     right = g_object_new( QOF_TYPE_INSTANCE, NULL );
-    
+
     g_test_message( "Test both null" );
     result = qof_instance_version_cmp( NULL, NULL );
-    g_assert_cmpint( result, ==, 0 );
-    
+    g_assert_cmpint( result, == , 0 );
+
     g_test_message( "Test left null" );
     result = qof_instance_version_cmp( NULL, right );
-    g_assert_cmpint( result, ==, -1 );
-    
+    g_assert_cmpint( result, == , -1 );
+
     g_test_message( "Test right null" );
     result = qof_instance_version_cmp( left, NULL );
-    g_assert_cmpint( result, ==, 1 );
-    
+    g_assert_cmpint( result, == , 1 );
+
     g_test_message( "Test left tv_sec lesser than right" );
     timespec_left.tv_sec = 0;
     timespec_right.tv_sec = 1;
     qof_instance_set_last_update( left, timespec_left );
     qof_instance_set_last_update( right, timespec_right );
     result = qof_instance_version_cmp( left, right );
-    g_assert_cmpint( result, ==, -1 );
-    
+    g_assert_cmpint( result, == , -1 );
+
     g_test_message( "Test right tv_sec lesser than left" );
     timespec_left.tv_sec = 1;
     timespec_right.tv_sec = 0;
     qof_instance_set_last_update( left, timespec_left );
     qof_instance_set_last_update( right, timespec_right );
     result = qof_instance_version_cmp( left, right );
-    g_assert_cmpint( result, ==, 1 );
-    
+    g_assert_cmpint( result, == , 1 );
+
     g_test_message( "Test left tv_nsec lesser than right" );
     timespec_left.tv_sec = 1;
     timespec_left.tv_nsec = 0;
@@ -285,8 +285,8 @@
     qof_instance_set_last_update( left, timespec_left );
     qof_instance_set_last_update( right, timespec_right );
     result = qof_instance_version_cmp( left, right );
-    g_assert_cmpint( result, ==, -1 );
-    
+    g_assert_cmpint( result, == , -1 );
+
     g_test_message( "Test right tv_sec lesser than left" );
     timespec_left.tv_sec = 1;
     timespec_left.tv_nsec = 1;
@@ -295,8 +295,8 @@
     qof_instance_set_last_update( left, timespec_left );
     qof_instance_set_last_update( right, timespec_right );
     result = qof_instance_version_cmp( left, right );
-    g_assert_cmpint( result, ==, 1 );
-    
+    g_assert_cmpint( result, == , 1 );
+
     g_test_message( "Test both equal" );
     timespec_left.tv_sec = 1;
     timespec_left.tv_nsec = 1;
@@ -305,8 +305,8 @@
     qof_instance_set_last_update( left, timespec_left );
     qof_instance_set_last_update( right, timespec_right );
     result = qof_instance_version_cmp( left, right );
-    g_assert_cmpint( result, ==, 0 );
-    
+    g_assert_cmpint( result, == , 0 );
+
     /* clear */
     g_object_unref( left );
     g_object_unref( right );
@@ -317,17 +317,17 @@
 {
     QofIdType type = "test type";
     QofCollection *col;
-    
+
     /* setup */
     col = qof_collection_new ( type );
     qof_instance_set_collection( fixture->inst, col );
     g_assert( qof_instance_get_collection( fixture->inst ) );
-    
+
     g_test_message( "Test get_dirty on empty instance returns false" );
     g_assert( qof_instance_get_dirty( NULL ) == FALSE );
-    
+
     g_test_message( "Test dirty in normal mode" );
-    g_assert( !qof_get_alt_dirty_mode() ); 
+    g_assert( !qof_get_alt_dirty_mode() );
     g_assert( !qof_instance_get_dirty_flag( fixture->inst ) );
     g_assert( !qof_collection_is_dirty( col ) );
     g_assert( !qof_instance_get_dirty( fixture->inst ) );
@@ -335,15 +335,15 @@
     g_assert( qof_instance_get_dirty_flag( fixture->inst ) );
     g_assert( qof_collection_is_dirty( col ) );
     g_assert( qof_instance_get_dirty( fixture->inst ) );
-    
-    
+
+
     g_test_message( "Test dirty in alternate mode" );
     qof_set_alt_dirty_mode ( TRUE );
     /* restore */
     qof_collection_mark_clean( col );
     qof_instance_set_dirty_flag( fixture->inst, FALSE );
-    
-    g_assert( qof_get_alt_dirty_mode() ); 
+
+    g_assert( qof_get_alt_dirty_mode() );
     g_assert( !qof_instance_get_dirty_flag( fixture->inst ) );
     g_assert( !qof_collection_is_dirty( col ) );
     g_assert( !qof_instance_get_dirty( fixture->inst ) );
@@ -351,7 +351,7 @@
     g_assert( qof_instance_get_dirty_flag( fixture->inst ) );
     g_assert( !qof_collection_is_dirty( col ) );
     g_assert( qof_instance_get_dirty( fixture->inst ) );
-    
+
     /* clean up */
     qof_instance_set_collection( fixture->inst, NULL );
     qof_collection_destroy( col );
@@ -362,7 +362,7 @@
 mock_get_display_name(const QofInstance* inst)
 {
     gchar *display_name;
-    
+
     g_assert( inst );
     g_assert( QOF_INSTANCE_GET_CLASS( inst )->get_display_name == mock_get_display_name );
     is_called = TRUE;
@@ -376,7 +376,7 @@
     QofIdType type = "test type";
     QofCollection *col;
     gchar *display_name, *default_display_name, *mock_display_name;
-  
+
     /* setup */
     g_assert( fixture->inst );
     is_called = FALSE;
@@ -386,21 +386,21 @@
     g_assert( qof_instance_get_collection( fixture->inst ) );
     default_display_name = g_strdup_printf( "Object %s %p", type, fixture->inst );
     mock_display_name = g_strdup_printf( "Mock display name %p", fixture->inst );
-    
+
     g_test_message( "Test instance when display name not set" );
     g_assert( QOF_INSTANCE_GET_CLASS( fixture->inst )->get_display_name == NULL );
     display_name = qof_instance_get_display_name( fixture->inst );
     g_assert( !is_called );
-    g_assert_cmpstr( display_name, ==, default_display_name );
+    g_assert_cmpstr( display_name, == , default_display_name );
     g_free( display_name );
-    
+
     g_test_message( "Test instance when display name is set" );
     QOF_INSTANCE_GET_CLASS( fixture->inst )->get_display_name = mock_get_display_name;
     display_name = qof_instance_get_display_name( fixture->inst );
     g_assert( is_called );
-    g_assert_cmpstr( display_name, ==, mock_display_name );
+    g_assert_cmpstr( display_name, == , mock_display_name );
     g_free( display_name );
-    
+
     /* clean up */
     g_free( default_display_name );
     g_free( mock_display_name );
@@ -414,7 +414,7 @@
     g_assert( be );
     g_assert( inst );
     g_assert( be->begin == mock_backend_begin );
-    g_assert_cmpstr( inst->e_type, ==, "test type" );
+    g_assert_cmpstr( inst->e_type, == , "test type" );
     is_called = TRUE;
 }
 
@@ -424,7 +424,7 @@
     QofBackend *be;
     QofBook *book;
     gboolean result;
-    
+
     /* setup */
     be = g_new0( QofBackend, 1 );
     g_assert( be );
@@ -436,25 +436,25 @@
     g_assert( fixture->inst );
     fixture->inst->e_type = "test type";
     g_assert( qof_instance_get_dirty_flag( fixture->inst ) == FALSE );
-    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), ==, 0 );
-    
+    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), == , 0 );
+
     g_test_message( "Test when instance is null" );
     result = qof_begin_edit( NULL );
     g_assert( result == FALSE );
-    
+
     g_test_message( "Test when instance's editlevel is >= 1" );
     qof_instance_increase_editlevel( fixture->inst );
     result = qof_begin_edit( fixture->inst );
     g_assert( result == FALSE );
-    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), ==, 2 );
-    
+    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), == , 2 );
+
     g_test_message( "Test when instance's editlevel is <= 0 and backend not set" );
     qof_instance_reset_editlevel( fixture->inst );
     result = qof_begin_edit( fixture->inst );
     g_assert( result == TRUE );
-    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), ==, 1 );
+    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), == , 1 );
     g_assert( qof_instance_get_dirty_flag( fixture->inst ) == TRUE );
-    
+
     g_test_message( "Test when instance's editlevel is <= 0 and backend is set" );
     result = FALSE;
     is_called = FALSE;
@@ -464,10 +464,10 @@
     be->begin = mock_backend_begin;
     result = qof_begin_edit( fixture->inst );
     g_assert( result == TRUE );
-    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), ==, 1 );
+    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), == , 1 );
     g_assert( qof_instance_get_dirty_flag( fixture->inst ) == FALSE );
     g_assert( is_called );
-    
+
     /* clean up */
     qof_book_set_backend( book, NULL );
     qof_book_destroy( book );
@@ -479,31 +479,31 @@
 test_instance_commit_edit( Fixture *fixture, gconstpointer pData )
 {
     gboolean result;
-    
+
     g_test_message( "Test when instance set to null" );
     result = qof_commit_edit( NULL );
     g_assert( !result );
-    
+
     g_test_message( "Test when instance's editlevel >= 2" );
     qof_instance_increase_editlevel( fixture->inst );
     qof_instance_increase_editlevel( fixture->inst );
-    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), ==, 2 );
+    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), == , 2 );
     result = qof_commit_edit( fixture->inst );
-    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), ==, 1 );
+    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), == , 1 );
     g_assert( !result );
-    
+
     g_test_message( "Test when instance's editlevel = 1" );
     result = qof_commit_edit( fixture->inst );
-    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), ==, 0 );
+    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), == , 0 );
     g_assert( result );
-    
+
     g_test_message( "Test when instance's editlevel < 0" );
     g_test_log_set_fatal_handler ( ( GTestLogFatalFunc )fatal_handler, NULL );
     qof_instance_decrease_editlevel( fixture->inst );
-    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), ==, -1 );
+    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), == , -1 );
     result = qof_commit_edit( fixture->inst );
-    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), ==, 0 );
-    g_assert_cmpstr( error_message, ==, "[qof_commit_edit()] unbalanced call - resetting (was -2)" );
+    g_assert_cmpint( qof_instance_get_editlevel( fixture->inst ), == , 0 );
+    g_assert_cmpstr( error_message, == , "[qof_commit_edit()] unbalanced call - resetting (was -2)" );
     g_free( error_message );
 }
 
@@ -513,7 +513,7 @@
 {
     gpointer inst;
     gpointer be;
-    
+
     gboolean commit_called;
     gboolean commit_with_err_called;
     gboolean on_error_called;
@@ -580,7 +580,7 @@
     QofBackend *be;
     QofBook *book;
     gboolean result;
-    
+
     /* setup */
     be = g_new0( QofBackend, 1 );
     g_assert( be );
@@ -589,7 +589,7 @@
     g_assert( book );
     g_assert( QOF_IS_BOOK( book ) );
     qof_book_set_backend( book, be );
-        
+
     /* init */
     result = FALSE;
     commit_test_part2.commit_called = FALSE;
@@ -600,7 +600,7 @@
     commit_test_part2.inst = fixture->inst;
     commit_test_part2.be = be;
     qof_instance_set_dirty_flag( fixture->inst, TRUE );
-    
+
     g_test_message( "Test when instance's backend not set, callbacks not set" );
     g_assert( qof_instance_get_infant( fixture->inst ) );
     g_assert( !qof_instance_get_destroying( fixture->inst ) );
@@ -613,18 +613,18 @@
     g_assert( !commit_test_part2.on_error_called );
     g_assert( !commit_test_part2.on_free_called );
     g_assert( !commit_test_part2.on_done_called );
-    
+
     g_test_message( "Test when instance's backend not set, do_free is true" );
     qof_instance_set_destroying( fixture->inst, TRUE );
     result = qof_commit_edit_part2( fixture->inst, mock_on_error, mock_on_done, mock_on_free );
     g_assert( result );
     g_assert( qof_instance_get_dirty_flag( fixture->inst ) );
     g_assert( !commit_test_part2.commit_called );
-    g_assert( !commit_test_part2.commit_with_err_called );    
+    g_assert( !commit_test_part2.commit_with_err_called );
     g_assert( !commit_test_part2.on_error_called );
     g_assert( commit_test_part2.on_free_called );
     g_assert( !commit_test_part2.on_done_called );
-    
+
     g_test_message( "Test when instance's backend not set, do_free is false" );
     qof_instance_set_destroying( fixture->inst, FALSE );
     commit_test_part2.on_free_called = FALSE;
@@ -636,7 +636,7 @@
     g_assert( !commit_test_part2.on_error_called );
     g_assert( !commit_test_part2.on_free_called );
     g_assert( commit_test_part2.on_done_called );
-    
+
     g_test_message( "Test when instance's backend is set, all cb set, no error produced" );
     qof_instance_set_book( fixture->inst, book );
     qof_instance_set_destroying( fixture->inst, FALSE );
@@ -646,11 +646,11 @@
     g_assert( result );
     g_assert( !qof_instance_get_dirty_flag( fixture->inst ) );
     g_assert( commit_test_part2.commit_called );
-    g_assert( !commit_test_part2.commit_with_err_called );    
+    g_assert( !commit_test_part2.commit_with_err_called );
     g_assert( !commit_test_part2.on_error_called );
     g_assert( !commit_test_part2.on_free_called );
     g_assert( commit_test_part2.on_done_called );
-    
+
     g_test_message( "Test when instance's backend is set, all cb set, error produced" );
     commit_test_part2.commit_called = FALSE;
     commit_test_part2.on_done_called = FALSE;
@@ -662,11 +662,11 @@
     g_assert( qof_instance_get_dirty_flag( fixture->inst ) );
     g_assert( !qof_instance_get_destroying( fixture->inst ) );
     g_assert( !commit_test_part2.commit_called );
-    g_assert( commit_test_part2.commit_with_err_called );    
+    g_assert( commit_test_part2.commit_with_err_called );
     g_assert( commit_test_part2.on_error_called );
     g_assert( !commit_test_part2.on_free_called );
     g_assert( !commit_test_part2.on_done_called );
-    
+
     /* clean up */
     qof_book_set_backend( book, NULL );
     qof_book_destroy( book );
@@ -682,7 +682,7 @@
 {
     gpointer inst;
     gpointer ref;
-    
+
     gboolean refers_to_object_called;
 } refers_test_struct;
 
@@ -701,7 +701,7 @@
 test_instance_refers_to_object( Fixture *fixture, gconstpointer pData )
 {
     QofInstance * ref;
-    
+
     ref = g_object_new( QOF_TYPE_INSTANCE, NULL );
     g_assert( fixture->inst );
     g_assert( ref );
@@ -709,16 +709,16 @@
     refers_test_struct.refers_to_object_called = FALSE;
     refers_test_struct.inst = fixture->inst;
     refers_test_struct.ref = ref;
-    
+
     g_test_message( "Test when refers to object not set" );
     g_assert( !qof_instance_refers_to_object( fixture->inst, ref ) );
     g_assert( !refers_test_struct.refers_to_object_called );
-    
+
     g_test_message( "Test when refers to object set" );
     QOF_INSTANCE_GET_CLASS( fixture->inst )->refers_to_object = mock_refers_to_object;
     g_assert( qof_instance_refers_to_object( fixture->inst, ref ) );
     g_assert( refers_test_struct.refers_to_object_called );
-    
+
     g_object_unref( ref );
 }
 
@@ -753,7 +753,7 @@
     /* randomly init number of entities >=0 and < 10 */
     gint32 list_length = g_test_rand_int_range( 0, 10 );
     int i;
-    
+
     /* setup book and ref instance */
     book = qof_book_new();
     g_assert( book );
@@ -761,41 +761,41 @@
     ref =  g_object_new( QOF_TYPE_INSTANCE, NULL );
     g_assert( ref );
     g_assert( QOF_IS_INSTANCE( ref ) );
-    QOF_INSTANCE_GET_CLASS( ref )->refers_to_object = NULL; 
+    QOF_INSTANCE_GET_CLASS( ref )->refers_to_object = NULL;
     refers_test_struct_from_col.call_count = 0;
-    /* init list of entities of one type, 
+    /* init list of entities of one type,
      * put them into book collection and
      * save in the list
      */
     for (i = 0; i < list_length; i++ )
     {
-	QofInstance *inst = g_object_new( QOF_TYPE_INSTANCE, NULL );
-	g_assert( inst );
-	qof_instance_init_data( inst, type, book );
-	inst_list = g_list_append ( inst_list, inst );
-	g_assert_cmpint( g_list_length( inst_list ), ==, (i + 1) );
+        QofInstance *inst = g_object_new( QOF_TYPE_INSTANCE, NULL );
+        g_assert( inst );
+        qof_instance_init_data( inst, type, book );
+        inst_list = g_list_append ( inst_list, inst );
+        g_assert_cmpint( g_list_length( inst_list ), == , (i + 1) );
     }
-    g_assert_cmpint( list_length, ==, g_list_length( inst_list ) );
-    
+    g_assert_cmpint( list_length, == , g_list_length( inst_list ) );
+
     g_test_message( "Test when refers to object not set" );
     coll = qof_book_get_collection( book, type );
     g_assert( coll );
     result = qof_instance_get_referring_object_list_from_collection( coll, ref );
     g_assert( !result );
-    g_assert_cmpint( refers_test_struct_from_col.call_count, ==, 0 );
-    
+    g_assert_cmpint( refers_test_struct_from_col.call_count, == , 0 );
+
     g_test_message( "Test when refers to object is set" );
     QOF_INSTANCE_GET_CLASS( ref )->refers_to_object = mock_refers_to_object_from_col;
     refers_test_struct_from_col.list = inst_list;
     refers_test_struct_from_col.ref = ref;
     result = qof_instance_get_referring_object_list_from_collection( coll, ref );
-    if ( list_length == 0 ) 
-	g_assert( !result );
+    if ( list_length == 0 )
+        g_assert( !result );
     else
-	g_assert( result );
-    g_assert_cmpint( g_list_length( inst_list ), ==, g_list_length( result ) );
-    g_assert_cmpint( g_list_length( inst_list ), ==, refers_test_struct_from_col.call_count );
-    
+        g_assert( result );
+    g_assert_cmpint( g_list_length( inst_list ), == , g_list_length( result ) );
+    g_assert_cmpint( g_list_length( inst_list ), == , refers_test_struct_from_col.call_count );
+
     /* clean up list and destroy book */
     g_list_foreach( inst_list, (GFunc) g_object_unref, NULL );
     g_list_free( inst_list );
@@ -808,7 +808,7 @@
 {
     gpointer inst;
     gpointer ref;
-    
+
     gboolean get_typed_referring_object_list_called;
 } get_typed_referring_object_list_struct;
 
@@ -816,7 +816,7 @@
 mock_get_typed_referring_object_list( const QofInstance* inst, const QofInstance* ref )
 {
     GList* result = NULL;
-    
+
     g_assert( inst );
     g_assert( ref );
     g_assert( get_typed_referring_object_list_struct.inst == inst );
@@ -832,7 +832,7 @@
     QofInstance *ref;
     QofBook *book;
     GList* result = NULL;
-    
+
     /* setup */
     inst = g_object_new( QOF_TYPE_INSTANCE, NULL );
     ref = g_object_new( QOF_TYPE_INSTANCE, NULL );
@@ -844,8 +844,8 @@
     QOF_INSTANCE_GET_CLASS( inst )->get_typed_referring_object_list = NULL;
     qof_instance_init_data( inst, "test type", book );
     get_typed_referring_object_list_struct.get_typed_referring_object_list_called = FALSE;
-    
-    /* 
+
+    /*
      * cases when refers to object is set are not tested in current function
      * as they are checked in the previous tests
      */
@@ -854,17 +854,17 @@
     g_assert( !result );
     g_assert( !get_typed_referring_object_list_struct.get_typed_referring_object_list_called );
     g_list_free( result );
-    
+
     g_test_message( "Test when get typed referring object list is set" );
     QOF_INSTANCE_GET_CLASS( inst )->get_typed_referring_object_list = mock_get_typed_referring_object_list;
     get_typed_referring_object_list_struct.inst = inst;
     get_typed_referring_object_list_struct.ref = ref;
     result = qof_instance_get_typed_referring_object_list( inst, ref );
     g_assert( result );
-    g_assert_cmpint( g_list_length( result ), ==, 1 );
+    g_assert_cmpint( g_list_length( result ), == , 1 );
     g_assert( get_typed_referring_object_list_struct.get_typed_referring_object_list_called );
     g_list_free( result );
-    
+
     /* clean */
     g_object_unref( inst );
     g_object_unref( ref );
@@ -884,8 +884,8 @@
     g_assert( ref );
     if ( inst->e_type == ref->e_type )
     {
-	get_referring_object_list_struct.refers_to_object_call_count++;
-	return TRUE;
+        get_referring_object_list_struct.refers_to_object_call_count++;
+        return TRUE;
     }
     return FALSE;
 }
@@ -913,8 +913,8 @@
     GList* inst_list1 = NULL;
     GList* inst_list2 = NULL;
     GList* result = NULL;
-    int i,j;
-    
+    int i, j;
+
     /* setup */
     book = qof_book_new();
     g_assert( book );
@@ -927,46 +927,46 @@
     qof_instance_init_data( ref2, type2, book );
     QOF_INSTANCE_GET_CLASS( ref1 )->refers_to_object = NULL;
     QOF_INSTANCE_GET_CLASS( ref1 )->get_typed_referring_object_list = NULL;
-    g_assert_cmpint( qof_collection_count( qof_book_get_collection( book, type1 ) ), ==, 1 );
-    g_assert_cmpint( qof_collection_count( qof_book_get_collection( book, type2 ) ), ==, 1 );
+    g_assert_cmpint( qof_collection_count( qof_book_get_collection( book, type1 ) ), == , 1 );
+    g_assert_cmpint( qof_collection_count( qof_book_get_collection( book, type2 ) ), == , 1 );
     get_referring_object_list_struct.refers_to_object_call_count = 0;
     get_referring_object_list_struct.get_typed_referring_object_list_count = 0;
     /*
      * fill two collections with different types
-     * and random number of elements 
+     * and random number of elements
      */
     for (i = 0; i < col1_length; i++ )
     {
-	QofInstance *inst = g_object_new( QOF_TYPE_INSTANCE, NULL );
-	g_assert( inst );
-	qof_instance_init_data( inst, type1, book );
-	inst_list1 = g_list_append ( inst_list1, inst );
-	g_assert_cmpint( g_list_length( inst_list1 ), ==, (i + 1) );
+        QofInstance *inst = g_object_new( QOF_TYPE_INSTANCE, NULL );
+        g_assert( inst );
+        qof_instance_init_data( inst, type1, book );
+        inst_list1 = g_list_append ( inst_list1, inst );
+        g_assert_cmpint( g_list_length( inst_list1 ), == , (i + 1) );
     }
-    g_assert_cmpint( qof_collection_count( qof_book_get_collection( book, type1 ) ), ==, col1_length + 1 );
-    g_assert_cmpint( g_list_length( inst_list1 ), ==, col1_length );
-    
+    g_assert_cmpint( qof_collection_count( qof_book_get_collection( book, type1 ) ), == , col1_length + 1 );
+    g_assert_cmpint( g_list_length( inst_list1 ), == , col1_length );
+
     for (j = 0; j < col2_length; j++ )
     {
-	QofInstance *inst = g_object_new( QOF_TYPE_INSTANCE, NULL );
-	g_assert( inst );
-	qof_instance_init_data( inst, type2, book );
-	inst_list2 = g_list_append ( inst_list2, inst );
-	g_assert_cmpint( g_list_length( inst_list2 ), ==, (j + 1) );
+        QofInstance *inst = g_object_new( QOF_TYPE_INSTANCE, NULL );
+        g_assert( inst );
+        qof_instance_init_data( inst, type2, book );
+        inst_list2 = g_list_append ( inst_list2, inst );
+        g_assert_cmpint( g_list_length( inst_list2 ), == , (j + 1) );
     }
-    g_assert_cmpint( qof_collection_count( qof_book_get_collection( book, type2 ) ), ==, col2_length + 1 );
-    g_assert_cmpint( g_list_length( inst_list2 ), ==, col2_length );
-    
+    g_assert_cmpint( qof_collection_count( qof_book_get_collection( book, type2 ) ), == , col2_length + 1 );
+    g_assert_cmpint( g_list_length( inst_list2 ), == , col2_length );
+
     g_test_message( "Test object list returned for ref1 instance by default" );
     result = qof_instance_get_referring_object_list( ref1 );
     g_assert( !result );
-    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, ==, 0 );
-    
+    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, == , 0 );
+
     g_test_message( "Test object list returned for ref2 instance by default" );
     result = qof_instance_get_referring_object_list( ref2 );
     g_assert( !result );
-    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, ==, 0 );
-    
+    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, == , 0 );
+
     /*
      * refers to object is made simple as it is tested enough
      * it checks if instance types are equal
@@ -977,27 +977,27 @@
     QOF_INSTANCE_GET_CLASS( ref1 )->refers_to_object = mock_simple_refers_to_object;
     result = qof_instance_get_referring_object_list( ref1 );
     g_assert( result );
-    g_assert_cmpint( g_list_length( result ), ==, col1_length + 1 );
-    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, ==, col1_length + 1 );
+    g_assert_cmpint( g_list_length( result ), == , col1_length + 1 );
+    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, == , col1_length + 1 );
     g_list_free( result );
-    
+
     g_test_message( "Test object list returned for ref2 instance when refers_to_object is set" );
     get_referring_object_list_struct.refers_to_object_call_count = 0;
     result = qof_instance_get_referring_object_list( ref2 );
     g_assert( result );
-    g_assert_cmpint( g_list_length( result ), ==, col2_length + 1 );
-    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, ==, col2_length + 1 );
+    g_assert_cmpint( g_list_length( result ), == , col2_length + 1 );
+    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, == , col2_length + 1 );
     g_list_free( result );
-    
+
     g_test_message( "Test object list returned for ref1 instance when refers_to_object is set and get typed set" );
     QOF_INSTANCE_GET_CLASS( ref1 )->get_typed_referring_object_list = mock_simple_get_typed_referring_object_list;
     get_referring_object_list_struct.refers_to_object_call_count = 0;
     get_referring_object_list_struct.get_typed_referring_object_list_count = 0;
     result = qof_instance_get_referring_object_list( ref1 );
     g_assert( result );
-    g_assert_cmpint( g_list_length( result ), ==, col1_length + 1 );
-    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, ==, col1_length + 1 );
-    g_assert_cmpint( get_referring_object_list_struct.get_typed_referring_object_list_count, ==, 2 );
+    g_assert_cmpint( g_list_length( result ), == , col1_length + 1 );
+    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, == , col1_length + 1 );
+    g_assert_cmpint( get_referring_object_list_struct.get_typed_referring_object_list_count, == , 2 );
     g_list_free( result );
 
     g_test_message( "Test object list returned for ref2 instance when refers_to_object is set and get typed set" );
@@ -1005,9 +1005,9 @@
     get_referring_object_list_struct.get_typed_referring_object_list_count = 0;
     result = qof_instance_get_referring_object_list( ref2 );
     g_assert( result );
-    g_assert_cmpint( g_list_length( result ), ==, col2_length + 1 );
-    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, ==, col2_length + 1 );
-    g_assert_cmpint( get_referring_object_list_struct.get_typed_referring_object_list_count, ==, 2 );
+    g_assert_cmpint( g_list_length( result ), == , col2_length + 1 );
+    g_assert_cmpint( get_referring_object_list_struct.refers_to_object_call_count, == , col2_length + 1 );
+    g_assert_cmpint( get_referring_object_list_struct.get_typed_referring_object_list_count, == , 2 );
     g_list_free( result );
 
     /* clean */

Modified: gnucash/trunk/src/libqof/qof/test/test-qofobject.c
===================================================================
--- gnucash/trunk/src/libqof/qof/test/test-qofobject.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/libqof/qof/test/test-qofobject.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -51,27 +51,27 @@
 new_object( QofIdType e_type, const char *type_label, MockFields field)
 {
     QofObject *object = NULL;
-    
+
     object = g_new0( QofObject, 1 );
     g_assert( object );
     object->interface_version = QOF_OBJECT_VERSION;
     object->e_type = e_type;
     object->type_label = type_label;
-    switch( field )
+    switch ( field )
     {
     case MOCK_OBJECT_BOOK_BEGIN:
-	object->book_begin = mock_object_book_begin;
-	break;
+        object->book_begin = mock_object_book_begin;
+        break;
     case MOCK_OBJECT_BOOK_END:
-	object->book_end = mock_object_book_begin;
-	break;
+        object->book_end = mock_object_book_begin;
+        break;
     case MOCK_OBJECT_DIRTY:
-	object->is_dirty = mock_object_dirty;
-	break;
+        object->is_dirty = mock_object_dirty;
+        break;
     case MOCK_OBJECT_MARK_CLEAN:
-	object->mark_clean = mock_object_mark_clean;
+        object->mark_clean = mock_object_mark_clean;
     case EMPTY:
-	break;
+        break;
     }
     return object;
 }
@@ -85,7 +85,7 @@
 setup( Fixture *fixture, gconstpointer pData )
 {
     qof_object_initialize();
-    fixture->qofobject = new_object( "my type object", "object desc", EMPTY );  
+    fixture->qofobject = new_object( "my type object", "object desc", EMPTY );
 }
 
 static void
@@ -97,7 +97,7 @@
 
 /*
  * Safely generates objects and registers them
- * 
+ *
  * Input: min_objects - minimum number of objects to be generated (should be between 0 and 5)
  * 	  mock_filed - function in qofobject to be mocked
  * Output: number of generated objects
@@ -108,23 +108,23 @@
     gint32 list_length = g_test_rand_int_range( min_objects, 5 );
     const char *types[5] = {"type1", "type2", "type3", "type4", "type5"};
     int i;
-    
-    g_assert_cmpint( min_objects, >=, 0 );
-    g_assert_cmpint( min_objects, <, 5 );
+
+    g_assert_cmpint( min_objects, >= , 0 );
+    g_assert_cmpint( min_objects, < , 5 );
     for (i = 0; i < list_length; i++ )
     {
-	QofObject *object = new_object( types[i], "desc", mock_field );
-	g_assert( object );
-	g_assert( qof_object_register( object ) );
-	g_assert_cmpint( g_list_length( get_object_modules() ), ==, (i + 1) );
+        QofObject *object = new_object( types[i], "desc", mock_field );
+        g_assert( object );
+        g_assert( qof_object_register( object ) );
+        g_assert_cmpint( g_list_length( get_object_modules() ), == , (i + 1) );
     }
-    g_assert_cmpint( list_length, ==, g_list_length( get_object_modules() ) );
-    
+    g_assert_cmpint( list_length, == , g_list_length( get_object_modules() ) );
+
     return list_length;
 }
 
 /*
- * TESTS 
+ * TESTS
  */
 static struct
 {
@@ -147,51 +147,51 @@
     GList *books = NULL;
     gint32 list_length = g_test_rand_int_range( 0, 5 );
     int i;
-    QofObject *simple_object = NULL;    
-    
+    QofObject *simple_object = NULL;
+
     for (i = 0; i < list_length; i++ )
     {
-	QofBook *book = qof_book_new();
-	g_assert( book );
-	books = g_list_prepend ( books, book );
-	g_assert_cmpint( g_list_length( books ), ==, (i + 1) );
+        QofBook *book = qof_book_new();
+        g_assert( book );
+        books = g_list_prepend ( books, book );
+        g_assert_cmpint( g_list_length( books ), == , (i + 1) );
     }
-    g_assert_cmpint( list_length, ==, g_list_length( books ) );
-    
+    g_assert_cmpint( list_length, == , g_list_length( books ) );
+
     g_test_message( "Test null check" );
     g_assert( qof_object_register( NULL ) == FALSE );
-    
+
     g_test_message( "Test new object register with book_begin specified" );
     fixture->qofobject->book_begin = mock_book_begin;
     book_begin_struct.books = books;
     book_begin_struct.call_count = 0;
     g_assert( qof_object_register( fixture->qofobject ) == TRUE );
     g_assert( qof_object_lookup( "my type object" ) == fixture->qofobject );
-    g_assert_cmpint( book_begin_struct.call_count, ==, list_length );
-    
+    g_assert_cmpint( book_begin_struct.call_count, == , list_length );
+
     g_test_message( "Test registering the same object one more time" );
     book_begin_struct.call_count = 0;
     g_assert( qof_object_register( fixture->qofobject ) == FALSE );
     g_assert( qof_object_lookup( "my type object" ) == fixture->qofobject );
-    g_assert_cmpint( book_begin_struct.call_count, ==, 0 );
-    
+    g_assert_cmpint( book_begin_struct.call_count, == , 0 );
+
     g_test_message( "Test new object register without book_begin specified" );
     simple_object = new_object( "my type simple", "simple desc", EMPTY );
     g_assert( qof_object_register( simple_object ) == TRUE );
     g_assert( qof_object_lookup( "my type simple" ) == simple_object );
-    g_assert_cmpint( book_begin_struct.call_count, ==, 0 );
-    
+    g_assert_cmpint( book_begin_struct.call_count, == , 0 );
+
     g_test_message( "Test register simple object one more time" );
     g_assert( qof_object_register( simple_object ) == FALSE );
     g_assert( qof_object_lookup( "my type simple" ) == simple_object );
-      
+
     g_test_message( "Test book begin is called only one time when object is registered" );
     simple_object->book_begin = mock_book_begin;
     book_begin_struct.books = books;
     book_begin_struct.call_count = 0;
     g_assert( qof_object_register( simple_object ) == FALSE );
-    g_assert_cmpint( book_begin_struct.call_count, ==, 0 );
-    
+    g_assert_cmpint( book_begin_struct.call_count, == , 0 );
+
     g_list_foreach( books, (GFunc) qof_book_destroy, NULL );
     g_list_free( books );
     g_free( simple_object );
@@ -202,19 +202,19 @@
 {
     g_test_message( "Test null check" );
     g_assert( qof_object_lookup( NULL ) == NULL );
-    
+
     g_test_message( "Test existing object lookup" );
     g_assert( qof_object_register( fixture->qofobject ) == TRUE );
     g_assert( qof_object_lookup( "my type object" ) == fixture->qofobject );
-    
+
     g_test_message( "Test non existing object lookup" );
     g_assert( qof_object_lookup( "anytype" ) == NULL );
 }
 
 static struct
 {
-  gpointer data1;
-  gpointer data2;
+    gpointer data1;
+    gpointer data2;
 } be_data;
 
 static void
@@ -230,12 +230,12 @@
     g_assert( qof_object_lookup_backend( "", "test" ) == NULL );
     g_assert( qof_object_lookup_backend( "test", NULL ) == NULL );
     g_assert( qof_object_lookup_backend( "test", "" ) == NULL );
-    
+
     g_test_message( "Test new backend and type insert" );
     g_assert( qof_object_lookup_backend( "type", "backend" ) == NULL );
     g_assert( qof_object_register_backend( "type", "backend", &be_data.data1 ) == TRUE );
     g_assert( qof_object_lookup_backend( "type", "backend" ) == &be_data.data1 );
-    
+
     g_test_message( "Test type insert into existing backend" );
     g_assert( qof_object_register_backend( "type2", "backend", &be_data.data2 ) == TRUE );
     g_assert( qof_object_lookup_backend( "type", "backend" ) == &be_data.data1 );
@@ -246,13 +246,13 @@
 test_qof_object_get_type_label( Fixture *fixture, gconstpointer pData )
 {
     g_assert( qof_object_get_type_label( NULL ) == NULL );
-    
+
     g_test_message( "Test with non existing object" );
     g_assert( qof_object_get_type_label( "anytype" ) == NULL );
-    
+
     g_test_message( "Test with existing registered object" );
     g_assert( qof_object_register( fixture->qofobject ) == TRUE );
-    g_assert_cmpstr( qof_object_get_type_label( "my type object" ), ==, "object desc" );
+    g_assert_cmpstr( qof_object_get_type_label( "my type object" ), == , "object desc" );
 }
 
 static struct
@@ -272,22 +272,22 @@
 test_qof_object_printable( Fixture *fixture, gconstpointer pData )
 {
     gint param;
-  
+
     g_test_message( "Test null checks" );
     g_assert( qof_object_printable( NULL, (gpointer)&param ) == NULL );
     g_assert( qof_object_printable( "test", NULL ) == NULL );
-    
+
     g_test_message( "Test with non registered object" );
     g_assert( qof_object_printable( "test", (gpointer)&param ) == NULL );
-    
+
     g_test_message( "Test with registered object and printable not set" );
     g_assert( qof_object_register( fixture->qofobject ) == TRUE );
     g_assert( qof_object_printable( "my type object", (gpointer)&param ) == NULL );
-    
+
     g_test_message( "Test with registered object and printable set" );
     fixture->qofobject->printable = mock_printable;
     printable_struct.param = (gpointer)¶m;
-    g_assert_cmpstr( qof_object_printable( "my type object", (gpointer)&param ), ==, "printable was called" );
+    g_assert_cmpstr( qof_object_printable( "my type object", (gpointer)&param ), == , "printable was called" );
 }
 
 static struct
@@ -309,31 +309,31 @@
 {
     QofBook *book = NULL, *book2 = NULL;
     gint32 list_length;
-    
+
     g_test_message( "Test book begin with no objects" );
-    g_assert_cmpint( 0, ==, g_list_length( get_book_list() ) );
+    g_assert_cmpint( 0, == , g_list_length( get_book_list() ) );
     object_book_begin_struct.call_count = 0;
     book = g_object_new(QOF_TYPE_BOOK, NULL);
     g_assert( book );
     qof_object_book_begin( book );
-    g_assert_cmpint( 1, ==, g_list_length( get_book_list() ) );
-    g_assert_cmpint( g_list_index( get_book_list(), (gconstpointer) book), !=, -1 );
-    g_assert_cmpint( object_book_begin_struct.call_count, ==, 0 );
-    
+    g_assert_cmpint( 1, == , g_list_length( get_book_list() ) );
+    g_assert_cmpint( g_list_index( get_book_list(), (gconstpointer) book), != , -1 );
+    g_assert_cmpint( object_book_begin_struct.call_count, == , 0 );
+
     qof_book_destroy( book );
-    
+
     list_length = generate_and_register_objects( 1, MOCK_OBJECT_BOOK_BEGIN );
-    
+
     g_test_message( "Test book begin with random objects registered and book begin set up" );
-    g_assert_cmpint( 0, ==, g_list_length( get_book_list() ) );
+    g_assert_cmpint( 0, == , g_list_length( get_book_list() ) );
     book2 = g_object_new(QOF_TYPE_BOOK, NULL);
     g_assert( book2 );
     object_book_begin_struct.book = book2;
     qof_object_book_begin( book2 );
-    g_assert_cmpint( 1, ==, g_list_length( get_book_list() ) );
-    g_assert_cmpint( g_list_index( get_book_list(), (gconstpointer) book2 ), !=, -1 );
-    g_assert_cmpint( object_book_begin_struct.call_count, ==, list_length );
-    
+    g_assert_cmpint( 1, == , g_list_length( get_book_list() ) );
+    g_assert_cmpint( g_list_index( get_book_list(), (gconstpointer) book2 ), != , -1 );
+    g_assert_cmpint( object_book_begin_struct.call_count, == , list_length );
+
     qof_book_destroy( book2 );
 }
 
@@ -341,29 +341,29 @@
 test_qof_object_book_end( Fixture *fixture, gconstpointer pData )
 {
     QofBook *book = NULL, *book2 = NULL;
-    gint32 list_length;    
-    
+    gint32 list_length;
+
     g_test_message( "Test book with no objects" );
     book = qof_book_new();
     g_assert( book );
     object_book_begin_struct.call_count = 0;
-    g_assert_cmpint( 1, ==, g_list_length( get_book_list() ) );
-    g_assert_cmpint( g_list_index( get_book_list(), (gconstpointer) book), !=, -1 );
+    g_assert_cmpint( 1, == , g_list_length( get_book_list() ) );
+    g_assert_cmpint( g_list_index( get_book_list(), (gconstpointer) book), != , -1 );
     qof_book_destroy( book ); /* calls object_book_end */
-    g_assert_cmpint( object_book_begin_struct.call_count, ==, 0 );
-    g_assert_cmpint( 0, ==, g_list_length( get_book_list() ) );
-    
+    g_assert_cmpint( object_book_begin_struct.call_count, == , 0 );
+    g_assert_cmpint( 0, == , g_list_length( get_book_list() ) );
+
     list_length = generate_and_register_objects( 1, MOCK_OBJECT_BOOK_END );
-    
+
     g_test_message( "Test book end with random objects registered and book end set up" );
     book2 = qof_book_new();
     g_assert( book2 );
     object_book_begin_struct.book = book2;
-    g_assert_cmpint( 1, ==, g_list_length( get_book_list() ) );
-    g_assert_cmpint( g_list_index( get_book_list(), (gconstpointer) book2 ), !=, -1 );
+    g_assert_cmpint( 1, == , g_list_length( get_book_list() ) );
+    g_assert_cmpint( g_list_index( get_book_list(), (gconstpointer) book2 ), != , -1 );
     qof_book_destroy( book2 ); /* calls object_book_end */
-    g_assert_cmpint( object_book_begin_struct.call_count, ==, list_length );
-    g_assert_cmpint( 0, ==, g_list_length( get_book_list() ) );
+    g_assert_cmpint( object_book_begin_struct.call_count, == , list_length );
+    g_assert_cmpint( 0, == , g_list_length( get_book_list() ) );
 }
 
 static struct
@@ -377,12 +377,12 @@
 mock_object_dirty( const QofCollection *col )
 {
     QofObject *obj = NULL;
-    
+
     g_assert( col );
     obj = object_dirty_struct.objects->data;
     object_dirty_struct.objects = object_dirty_struct.objects->next;
     g_assert( obj );
-    g_assert_cmpstr( qof_collection_get_type( col ), ==, obj->e_type );
+    g_assert_cmpstr( qof_collection_get_type( col ), == , obj->e_type );
     object_dirty_struct.call_count++;
     return object_dirty_struct.result;
 }
@@ -395,29 +395,29 @@
 
     g_test_message( "Test null check returns false" );
     g_assert( qof_object_is_dirty( NULL ) == FALSE );
-    
+
     g_test_message( "Test with no objects" );
     book = qof_book_new();
     g_assert( book );
     object_dirty_struct.call_count = 0;
     g_assert( qof_object_is_dirty( book ) == FALSE );
-    g_assert_cmpint( object_dirty_struct.call_count, ==, 0 );
-    
+    g_assert_cmpint( object_dirty_struct.call_count, == , 0 );
+
     list_length = generate_and_register_objects( 1, MOCK_OBJECT_DIRTY );
-    
+
     g_test_message( "Test with registered objects and suppose all collections are clean" );
     object_dirty_struct.objects = get_object_modules();
     object_dirty_struct.result = FALSE;
     g_assert( qof_object_is_dirty( book ) == FALSE );
-    g_assert_cmpint( object_dirty_struct.call_count, ==, list_length );
-    
+    g_assert_cmpint( object_dirty_struct.call_count, == , list_length );
+
     g_test_message( "Test with registered objects and suppose first collection is dirty" );
     object_dirty_struct.objects = get_object_modules();
     object_dirty_struct.result = TRUE;
     object_dirty_struct.call_count = 0;
     g_assert( qof_object_is_dirty( book ) == TRUE );
-    g_assert_cmpint( object_dirty_struct.call_count, ==, 1 ); /* should break on first */
-    
+    g_assert_cmpint( object_dirty_struct.call_count, == , 1 ); /* should break on first */
+
     qof_book_destroy( book );
 }
 
@@ -431,12 +431,12 @@
 mock_object_mark_clean( QofCollection *col )
 {
     QofObject *obj = NULL;
-    
+
     g_assert( col );
     obj = object_mark_clean_struct.objects->data;
     object_mark_clean_struct.objects = object_mark_clean_struct.objects->next;
     g_assert( obj );
-    g_assert_cmpstr( qof_collection_get_type( col ), ==, obj->e_type );
+    g_assert_cmpstr( qof_collection_get_type( col ), == , obj->e_type );
     object_mark_clean_struct.call_count++;
 }
 
@@ -450,16 +450,16 @@
     book = qof_book_new();
     g_assert( book );
     object_mark_clean_struct.call_count = 0;
-    g_assert_cmpint( g_list_length( get_object_modules() ), ==, 0 );
+    g_assert_cmpint( g_list_length( get_object_modules() ), == , 0 );
     qof_object_mark_clean( book );
-    g_assert_cmpint( object_mark_clean_struct.call_count, ==, 0 );
-    
+    g_assert_cmpint( object_mark_clean_struct.call_count, == , 0 );
+
     list_length = generate_and_register_objects( 1, MOCK_OBJECT_MARK_CLEAN );
-    
+
     g_test_message( "Test with registered objects and mark clean set up" );
     object_mark_clean_struct.objects = get_object_modules();
     qof_object_mark_clean( book );
-    g_assert_cmpint( object_mark_clean_struct.call_count, ==, list_length );
+    g_assert_cmpint( object_mark_clean_struct.call_count, == , list_length );
 
     qof_book_destroy( book );
 }
@@ -475,7 +475,7 @@
 mock_object_create( QofBook *book )
 {
     QofInstance *inst = NULL;
-    
+
     inst = g_object_new(QOF_TYPE_INSTANCE, NULL);
     g_assert( inst );
     g_assert( QOF_IS_INSTANCE( inst ) );
@@ -491,16 +491,16 @@
 {
     QofBook *book = NULL;
     QofInstance *inst = NULL;
-    
+
     book = qof_book_new();
     g_assert( book );
-    
+
     g_test_message( "Test null check" );
     g_assert( qof_object_new_instance( NULL, book ) == NULL );
-    
+
     g_test_message( "Test non existing object type" );
     g_assert( qof_object_new_instance( "non existing type", book ) == NULL );
-    
+
     g_test_message( "Test with registered object type and create not set" );
     g_assert( qof_object_register( fixture->qofobject ) );
     g_assert( qof_object_new_instance( fixture->qofobject->e_type, book ) == NULL );
@@ -528,22 +528,22 @@
 test_qof_object_compliance( Fixture *fixture, gconstpointer pData )
 {
     g_assert( qof_object_register( fixture->qofobject ) );
-    
+
     g_test_message( "Test when neither create nor foreach set" );
     g_assert( qof_object_compliance( fixture->qofobject->e_type, FALSE ) == FALSE );
     g_assert( qof_object_compliance( fixture->qofobject->e_type, TRUE ) == FALSE );
-    
+
     g_test_message( "Test when only create set" );
     fixture->qofobject->create = mock_object_create;
     g_assert( qof_object_compliance( fixture->qofobject->e_type, FALSE ) == FALSE );
     g_assert( qof_object_compliance( fixture->qofobject->e_type, TRUE ) == FALSE );
-    
+
     g_test_message( "Test when only foreach set" );
     fixture->qofobject->create = NULL;
     fixture->qofobject->foreach = mock_object_foreach;
     g_assert( qof_object_compliance( fixture->qofobject->e_type, FALSE ) == FALSE );
     g_assert( qof_object_compliance( fixture->qofobject->e_type, TRUE ) == FALSE );
-    
+
     g_test_message( "Test when both set" );
     fixture->qofobject->create = mock_object_create;
     fixture->qofobject->foreach = mock_object_foreach;
@@ -577,18 +577,18 @@
 
     g_test_message( "Test with no objects" );
     foreach_type_cb_struct.call_count = 0;
-    g_assert_cmpint( g_list_length( get_object_modules() ), ==, 0 );
+    g_assert_cmpint( g_list_length( get_object_modules() ), == , 0 );
     qof_object_foreach_type( mock_foreach_type_cb, ( gpointer ) &user_data );
-    g_assert_cmpint( foreach_type_cb_struct.call_count, ==, 0 );
-    
+    g_assert_cmpint( foreach_type_cb_struct.call_count, == , 0 );
+
     list_length = generate_and_register_objects( 1, EMPTY );
-    
+
     g_test_message( "Test foreach cb" );
     foreach_type_cb_struct.objects = get_object_modules();
     foreach_type_cb_struct.user_data = ( gpointer ) &user_data;
     foreach_type_cb_struct.call_count = 0;
     qof_object_foreach_type( mock_foreach_type_cb, ( gpointer ) &user_data );
-    g_assert_cmpint( foreach_type_cb_struct.call_count, ==, list_length );
+    g_assert_cmpint( foreach_type_cb_struct.call_count, == , list_length );
 }
 
 static struct
@@ -599,7 +599,7 @@
     gboolean is_called;
 } foreach_cb_struct;
 
-static void 
+static void
 mock_instance_foreach_cb( QofInstance *inst, gpointer user_data )
 {
 }
@@ -622,13 +622,13 @@
     gint user_data;
     QofBook *book = NULL;
     QofCollection *col = NULL;
-    
+
     /* setup */
     book = qof_book_new();
-    g_assert( book );    
-    g_assert_cmpint( g_list_length( get_object_modules() ), ==, 0 );
+    g_assert( book );
+    g_assert_cmpint( g_list_length( get_object_modules() ), == , 0 );
     qof_object_register( fixture->qofobject );
-    g_assert_cmpint( g_list_length( get_object_modules() ), ==, 1 );
+    g_assert_cmpint( g_list_length( get_object_modules() ), == , 1 );
     col = qof_book_get_collection( book, fixture->qofobject->e_type ); /* make col already exist */
     g_assert( col );
 
@@ -640,7 +640,7 @@
     fixture->qofobject->foreach = mock_foreach;
     qof_object_foreach( fixture->qofobject->e_type, book, mock_instance_foreach_cb, ( gpointer ) &user_data );
     g_assert( foreach_cb_struct.is_called == TRUE );
-    
+
     qof_book_destroy( book );
 }
 
@@ -655,23 +655,23 @@
 mock_foreach_for_sorted( const QofCollection *col, QofInstanceForeachCB cb, gpointer user_data )
 {
     GList *iter;
-    
+
     g_assert( col );
     g_assert( cb );
     g_assert( user_data );
-    
+
     for (iter = foreach_for_sorted_struct.instances; iter; iter = iter->next)
     {
         cb( iter->data, user_data );
     }
 }
 
-static void 
+static void
 mock_instance_foreach_cb_for_sorted( QofInstance *inst, gpointer user_data )
 {
     g_assert( inst );
     g_assert( user_data );
-    g_assert_cmpint( g_list_index( foreach_for_sorted_struct.instances, (gconstpointer) inst ), !=, -1 );
+    g_assert_cmpint( g_list_index( foreach_for_sorted_struct.instances, (gconstpointer) inst ), != , -1 );
     g_assert( user_data == foreach_for_sorted_struct.user_data );
     foreach_for_sorted_struct.call_count++;
 }
@@ -685,31 +685,31 @@
     QofBook *book = NULL;
     QofCollection *col = NULL;
     foreach_for_sorted_struct.instances = NULL;
-    
+
     /* setup */
     book = qof_book_new();
-    g_assert( book );    
-    g_assert_cmpint( g_list_length( get_object_modules() ), ==, 0 );
+    g_assert( book );
+    g_assert_cmpint( g_list_length( get_object_modules() ), == , 0 );
     qof_object_register( fixture->qofobject );
-    g_assert_cmpint( g_list_length( get_object_modules() ), ==, 1 );
+    g_assert_cmpint( g_list_length( get_object_modules() ), == , 1 );
 
     fixture->qofobject->foreach = mock_foreach_for_sorted;
     /* init instances */
     col = qof_book_get_collection( book, fixture->qofobject->e_type );
     for (i = 0; i < list_length; i++ )
     {
-	QofInstance * inst = g_object_new( QOF_TYPE_INSTANCE, NULL );
-	g_assert( QOF_IS_INSTANCE( inst ) );
-	foreach_for_sorted_struct.instances = g_list_append( foreach_for_sorted_struct.instances, inst );
-	qof_collection_insert_entity( col, inst );
+        QofInstance * inst = g_object_new( QOF_TYPE_INSTANCE, NULL );
+        g_assert( QOF_IS_INSTANCE( inst ) );
+        foreach_for_sorted_struct.instances = g_list_append( foreach_for_sorted_struct.instances, inst );
+        qof_collection_insert_entity( col, inst );
     }
-    g_assert_cmpint( list_length, ==, g_list_length( foreach_for_sorted_struct.instances ) );    
-    
+    g_assert_cmpint( list_length, == , g_list_length( foreach_for_sorted_struct.instances ) );
+
     foreach_for_sorted_struct.call_count = 0;
     foreach_for_sorted_struct.user_data = &user_data;
     qof_object_foreach_sorted( fixture->qofobject->e_type, book, mock_instance_foreach_cb_for_sorted, ( gpointer ) &user_data );
-    g_assert_cmpint( list_length, ==, foreach_for_sorted_struct.call_count );
-    
+    g_assert_cmpint( list_length, == , foreach_for_sorted_struct.call_count );
+
     qof_book_destroy( book );
     g_list_free( foreach_for_sorted_struct.instances );
 }
@@ -728,7 +728,7 @@
     g_assert( type );
     g_assert( backend_data );
     g_assert( user_data );
-    g_assert_cmpstr( type, ==, foreach_backend_struct.type );
+    g_assert_cmpstr( type, == , foreach_backend_struct.type );
     g_assert( backend_data == foreach_backend_struct.backend_data );
     g_assert( user_data == foreach_backend_struct.user_data );
     foreach_backend_struct.call_count++;
@@ -736,20 +736,20 @@
 
 static void
 test_qof_object_foreach_backend( Fixture *fixture, gconstpointer pData )
-{	
+{
     gint backend_data;
     gint user_data;
-    
-    g_assert_cmpint( g_hash_table_size( get_backend_data() ), ==, 0 );
+
+    g_assert_cmpint( g_hash_table_size( get_backend_data() ), == , 0 );
     qof_object_register_backend( "type1", "backend", (gpointer) &backend_data ); /* register backend */
-    g_assert_cmpint( g_hash_table_size( get_backend_data() ), ==, 1 );
-    
+    g_assert_cmpint( g_hash_table_size( get_backend_data() ), == , 1 );
+
     foreach_backend_struct.call_count = 0;
     foreach_backend_struct.backend_data = (gpointer) &backend_data;
     foreach_backend_struct.user_data = (gpointer) &user_data;
     foreach_backend_struct.type = "type1";
     qof_object_foreach_backend ( "backend", mock_foreach_backend, (gpointer) &user_data);
-    g_assert_cmpint( foreach_backend_struct.call_count, ==, 1 );
+    g_assert_cmpint( foreach_backend_struct.call_count, == , 1 );
 }
 
 void

Modified: gnucash/trunk/src/python/gncmod-python.c
===================================================================
--- gnucash/trunk/src/python/gncmod-python.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/python/gncmod-python.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -74,12 +74,15 @@
     init_filename = g_build_filename(pkgdatadir, "python/init.py", (char*)NULL);
     g_debug("Looking for python init script at %s", (init_filename ? init_filename : "<null>"));
     fp = fopen(init_filename, "r+");
-    if (fp) {
+    if (fp)
+    {
         PyRun_SimpleFile(fp, init_filename);
         fclose(fp);
 
         /* PyRun_InteractiveLoop(stdin, "foo"); */
-    } else {
+    }
+    else
+    {
         g_warning("Unable to initialize Python module (unable to open %s)", init_filename);
     }
     g_free(init_filename);

Modified: gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-sheet.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/register/register-gnome/gnucash-sheet.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -983,7 +983,7 @@
         *position = g_utf8_strlen(retval, -1);
 
     if (start_sel != end_sel)
-	gtk_editable_select_region(editable, start_sel, end_sel);
+        gtk_editable_select_region(editable, start_sel, end_sel);
 
     g_string_free (new_text_gs, TRUE);
     g_string_free (change_text_gs, TRUE);
@@ -2010,7 +2010,7 @@
     gtk_editable_get_selection_bounds (editable, &sel_start, &sel_end);
     gtk_editable_set_position (editable, tmp_pos);
     if (sel_start != sel_end)
-	gtk_editable_select_region (editable, sel_start, sel_end);
+        gtk_editable_select_region (editable, sel_start, sel_end);
 
     gnucash_sheet_im_context_reset_flags(sheet);
 }

Modified: gnucash/trunk/src/report/report-gnome/dialog-column-view.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/dialog-column-view.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/report/report-gnome/dialog-column-view.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -154,12 +154,12 @@
 
             if (scm_is_equal (SCM_CAR(names), selection))
                 row = i;
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (scm_call_2(template_menu_name, SCM_CAR(names),
-                                          SCM_BOOL_F));
+                                                   SCM_BOOL_F));
             name = _(g_strdup (str));
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
             gtk_list_store_append(store, &iter);
             gtk_list_store_set(store, &iter,
                                AVAILABLE_COL_NAME, name,
@@ -205,11 +205,11 @@
 
             id = scm_num2int(SCM_CAAR(contents), SCM_ARG1, G_STRFUNC);
             this_report = gnc_report_find(id);
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (scm_call_1(report_menu_name, this_report));
             name = _(g_strdup (str));
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
 
             gtk_list_store_append(store, &iter);
             gtk_list_store_set

Modified: gnucash/trunk/src/report/report-gnome/dialog-custom-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/dialog-custom-report.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/report/report-gnome/dialog-custom-report.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -121,11 +121,11 @@
         {
             char * str;
 
-            scm_dynwind_begin (0); 
+            scm_dynwind_begin (0);
             str = scm_to_locale_string (scm_call_2(template_menu_name, SCM_CAR(names), SCM_BOOL_F));
             name = g_strdup (str);
-            scm_dynwind_free (str); 
-            scm_dynwind_end (); 
+            scm_dynwind_free (str);
+            scm_dynwind_end ();
 
             gtk_list_store_append(store, &iter);
             gtk_list_store_set(store, &iter,
@@ -311,11 +311,11 @@
     {
         char * str;
 
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         str = scm_to_locale_string(scm_call_2(template_menu_name, guid, SCM_BOOL_F));
         report_name = g_strdup (str);
-        scm_dynwind_free (str); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (str);
+        scm_dynwind_end ();
 
         /* we must confirm the user wants to delete their precious custom report! */
         if (gnc_verify_dialog(crd->dialog, FALSE, "Are you sure you want to delete %s?", report_name))

Modified: gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -203,11 +203,11 @@
         const char* orig_name;
 
         SCM t = SCM_CAR(templates);
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         str = scm_to_locale_string (scm_call_1(t_name, t));
         orig_name = g_strdup (str);
-        scm_dynwind_free (str); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (str);
+        scm_dynwind_end ();
 
         /* Store the untranslated names for lookup later */
         template_names = g_list_prepend (template_names, (gpointer)orig_name);
@@ -264,11 +264,11 @@
 
     get_name = scm_c_eval_string("gnc:html-style-sheet-name");
     scm_name = scm_call_1(get_name, sheet_info);
-    scm_dynwind_begin (0); 
+    scm_dynwind_begin (0);
     str = scm_to_locale_string (scm_name);
     c_name = g_strdup (str);
-    scm_dynwind_free (str); 
-    scm_dynwind_end (); 
+    scm_dynwind_free (str);
+    scm_dynwind_end ();
     if (!c_name)
         return;
 

Modified: gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -773,13 +773,13 @@
         }
 
         key_name = g_strdup_printf(SCHEME_OPTIONS_N, id);
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         str = scm_to_locale_string (scm_text);
         text = gnc_guile_strip_comments(str);
         g_key_file_set_string(key_file, group_name, key_name, text);
         g_free(text);
-        scm_dynwind_free (str); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (str);
+        scm_dynwind_end ();
         g_free(key_name);
     }
 
@@ -790,13 +790,13 @@
         return;
     }
 
-    scm_dynwind_begin (0); 
+    scm_dynwind_begin (0);
     str = scm_to_locale_string (scm_text);
     text = gnc_guile_strip_comments(str);
     g_key_file_set_string(key_file, group_name, SCHEME_OPTIONS, text);
     g_free(text);
-    scm_dynwind_free (str); 
-    scm_dynwind_end (); 
+    scm_dynwind_free (str);
+    scm_dynwind_end ();
     LEAVE(" ");
 }
 
@@ -1369,11 +1369,11 @@
             break;
         }
 
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         name = scm_to_locale_string (scm);
         choices = g_list_prepend (choices, g_strdup (name));
-        scm_dynwind_free (name); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (name);
+        scm_dynwind_end ();
     }
 
     if (!bad)
@@ -1423,11 +1423,11 @@
     else
     {
         char * str;
-        scm_dynwind_begin (0); 
+        scm_dynwind_begin (0);
         str = scm_to_locale_string(SCM_CAR (choice));
         type = g_strdup (str);
-        scm_dynwind_free (str); 
-        scm_dynwind_end (); 
+        scm_dynwind_free (str);
+        scm_dynwind_end ();
     }
 
     /* %s is the type of what is about to be saved, e.g. "HTML". */

Modified: gnucash/trunk/src/report/report-gnome/window-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/window-report.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/report/report-gnome/window-report.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -162,11 +162,11 @@
                 {
                     char * str;
 
-                    scm_dynwind_begin (0); 
+                    scm_dynwind_begin (0);
                     str = scm_to_locale_string (ptr);
                     title = g_strdup (str);
-                    scm_dynwind_free (str); 
-                    scm_dynwind_end (); 
+                    scm_dynwind_free (str);
+                    scm_dynwind_end ();
                 }
             }
         }

Modified: gnucash/trunk/src/report/report-system/gnc-report.c
===================================================================
--- gnucash/trunk/src/report/report-system/gnc-report.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/report/report-system/gnc-report.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -156,11 +156,11 @@
     if (scm_text == SCM_UNDEFINED || !scm_is_string (scm_text))
         return FALSE;
 
-    scm_dynwind_begin (0); 
+    scm_dynwind_begin (0);
     free_data = scm_to_locale_string (scm_text);
     *data = g_strdup (free_data);
-    scm_dynwind_free (free_data); 
-    scm_dynwind_end (); 
+    scm_dynwind_free (free_data);
+    scm_dynwind_end ();
 
     return TRUE;
 }
@@ -198,11 +198,11 @@
     if (!scm_is_string(value))
         return NULL;
 
-    scm_dynwind_begin (0); 
+    scm_dynwind_begin (0);
     str = scm_to_locale_string (value);
     report_name = g_strdup (str);
-    scm_dynwind_free (str); 
-    scm_dynwind_end (); 
+    scm_dynwind_free (str);
+    scm_dynwind_end ();
 
     return report_name;
 }

Modified: gnucash/trunk/src/test-core/test-stuff.c
===================================================================
--- gnucash/trunk/src/test-core/test-stuff.c	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/test-core/test-stuff.c	2011-08-22 07:10:56 UTC (rev 21205)
@@ -26,7 +26,7 @@
     gpointer data;
     gboolean called;
     gchar *msg;
-}TestStruct;
+} TestStruct;
 
 static TestStruct tdata;
 
@@ -360,7 +360,7 @@
 
 void
 test_silent_logger(  const char *log_domain, GLogLevelFlags log_level,
-		    const gchar *msg, gpointer user_data )
+                     const gchar *msg, gpointer user_data )
 {
     //Silent, remember?
     return;
@@ -368,17 +368,18 @@
 
 gboolean
 test_handle_faults( const char *log_domain, GLogLevelFlags log_level,
-		    const gchar *msg, gpointer user_data )
+                    const gchar *msg, gpointer user_data )
 {
     TestErrorStruct *tdata = (TestErrorStruct*)user_data;
-    if (tdata == NULL) {
-	g_printf("Recieved Error Message %s\n", msg);
-	return FALSE;
+    if (tdata == NULL)
+    {
+        g_printf("Recieved Error Message %s\n", msg);
+        return FALSE;
     }
     if (tdata->log_domain != NULL)
-	g_assert(g_strcmp0(tdata->log_domain, log_domain) == 0);
+        g_assert(g_strcmp0(tdata->log_domain, log_domain) == 0);
     if (tdata->log_level)
-	g_assert(log_level == tdata->log_level);
+        g_assert(log_level == tdata->log_level);
     tdata->msg = g_strdup(msg);
     return FALSE;
 }
@@ -412,7 +413,8 @@
 }
 
 void
-test_free( gpointer data ) {
+test_free( gpointer data )
+{
     if (!data) return;
     g_free(data);
 }

Modified: gnucash/trunk/src/test-core/test-stuff.h
===================================================================
--- gnucash/trunk/src/test-core/test-stuff.h	2011-08-22 03:58:20 UTC (rev 21204)
+++ gnucash/trunk/src/test-core/test-stuff.h	2011-08-22 07:10:56 UTC (rev 21205)
@@ -53,9 +53,9 @@
 #define do_test_args( result, title, format ) do_test_call( result, title, __FILE__, __LINE__, format, ... );
 */
 
-/** 
+/**
  * Use this macro to format informative test path output when using g_test_add.
- * Suite stands for tests' pack, while path for individual test name. 
+ * Suite stands for tests' pack, while path for individual test name.
 */
 
 #define GNC_TEST_ADD( suite, path, fixture, data, setup, test, teardown )\
@@ -65,9 +65,9 @@
     g_free( testpath );\
 }
 
-/** 
+/**
  * Use this macro to format informative test path output when using g_test_add_func.
- * Suite stands for tests' pack, while path for individual test name. 
+ * Suite stands for tests' pack, while path for individual test name.
 */
 
 #define GNC_TEST_ADD_FUNC( suite, path, test )\
@@ -93,23 +93,23 @@
     gchar *msg;
 } TestErrorStruct;
 
- /**
-  * Pass this to g_test_log_set_fatal_handler(), setting user_data to
-  * a pointer to TestErrorStruct to intercept and handle expected
-  * error and warning messages. It will g_assert if an error is
-  * received which doesn't match the log_level, log_domain, and
-  * message in the struct (if they're set), or return FALSE to prevent
-  * the message from aborting. Be sure to g_free() the
-  * TestErrorData:msg after you're done testing it.
-  */
+/**
+ * Pass this to g_test_log_set_fatal_handler(), setting user_data to
+ * a pointer to TestErrorStruct to intercept and handle expected
+ * error and warning messages. It will g_assert if an error is
+ * received which doesn't match the log_level, log_domain, and
+ * message in the struct (if they're set), or return FALSE to prevent
+ * the message from aborting. Be sure to g_free() the
+ * TestErrorData:msg after you're done testing it.
+ */
 gboolean test_handle_faults( const char *log_domain, GLogLevelFlags log_level,
-			     const gchar *msg, gpointer user_data);
+                             const gchar *msg, gpointer user_data);
 /**
  * When you know you're going to get a useless log message, pass this
  * to g_log_set_default_handler to shut it up.
  */
 void test_silent_logger(  const char *log_domain, GLogLevelFlags log_level,
-			  const gchar *msg, gpointer user_data );
+                          const gchar *msg, gpointer user_data );
 /**
  * Call this from a mock object to indicate that the mock has in fact
  * been called



More information about the gnucash-changes mailing list