r23358 - gnucash/trunk/src - Code reindentation

Geert Janssens gjanssens at code.gnucash.org
Thu Oct 31 18:22:54 EDT 2013


Author: gjanssens
Date: 2013-10-31 18:22:53 -0400 (Thu, 31 Oct 2013)
New Revision: 23358
Trac: http://svn.gnucash.org/trac/changeset/23358

Modified:
   gnucash/trunk/src/app-utils/gnc-gsettings.c
   gnucash/trunk/src/app-utils/gnc-gsettings.h
   gnucash/trunk/src/app-utils/gnc-prefs-utils.c
   gnucash/trunk/src/app-utils/gnc-state.c
   gnucash/trunk/src/business/business-gnome/business-gnome-utils.h
   gnucash/trunk/src/business/business-gnome/dialog-invoice.c
   gnucash/trunk/src/business/business-gnome/dialog-order.c
   gnucash/trunk/src/business/business-gnome/dialog-payment.c
   gnucash/trunk/src/core-utils/gnc-prefs-p.h
   gnucash/trunk/src/core-utils/gnc-prefs.c
   gnucash/trunk/src/core-utils/gnc-prefs.h
   gnucash/trunk/src/engine/gnc-budget.c
   gnucash/trunk/src/engine/gnc-pricedb.c
   gnucash/trunk/src/engine/gncInvoice.h
   gnucash/trunk/src/engine/gncOwner.c
   gnucash/trunk/src/engine/gncTaxTable.c
   gnucash/trunk/src/gnome-utils/dialog-commodity.c
   gnucash/trunk/src/gnome-utils/dialog-dup-trans.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-cell-renderer-date.h
   gnucash/trunk/src/gnome-utils/gnc-cell-renderer-popup-entry.c
   gnucash/trunk/src/gnome-utils/gnc-cell-renderer-popup-entry.h
   gnucash/trunk/src/gnome-utils/gnc-combott.c
   gnucash/trunk/src/gnome-utils/gnc-currency-edit.c
   gnucash/trunk/src/gnome-utils/gnc-date-delta.c
   gnucash/trunk/src/gnome-utils/gnc-date-edit.c
   gnucash/trunk/src/gnome-utils/gnc-main-window.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.c
   gnucash/trunk/src/gnome-utils/gnc-tree-view.h
   gnucash/trunk/src/gnome-utils/window-main-summarybar.c
   gnucash/trunk/src/gnome/assistant-hierarchy.c
   gnucash/trunk/src/gnome/dialog-lot-viewer.c
   gnucash/trunk/src/gnome/dialog-print-check.c
   gnucash/trunk/src/gnome/dialog-print-check2.c
   gnucash/trunk/src/gnome/dialog-print-check2.h
   gnucash/trunk/src/gnome/dialog-sx-since-last-run.c
   gnucash/trunk/src/gnome/dialog-tax-info.c
   gnucash/trunk/src/gnome/gnc-budget-view.c
   gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c
   gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
   gnucash/trunk/src/gnome/gnc-plugin-page-budget.c
   gnucash/trunk/src/gnome/top-level.c
   gnucash/trunk/src/gnome/window-reconcile.c
   gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c
   gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c
   gnucash/trunk/src/import-export/csv-export/csv-transactions-export.c
   gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.c
   gnucash/trunk/src/import-export/csv-import/assistant-csv-trans-import.c
   gnucash/trunk/src/import-export/csv-import/gnc-csv-model.c
   gnucash/trunk/src/import-export/import-account-matcher.c
   gnucash/trunk/src/import-export/import-backend.c
   gnucash/trunk/src/import-export/import-format-dialog.c
   gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
   gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
   gnucash/trunk/src/plugins/bi_import/dialog-bi-import.c
   gnucash/trunk/src/report/report-gnome/dialog-custom-report.c
   gnucash/trunk/src/report/report-gnome/dialog-report-column-view.c
   gnucash/trunk/src/report/report-gnome/dialog-report-style-sheet.c
   gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
Log:
Code reindentation

Command used: astyle --indent=spaces=4 --brackets=break --suffix=none <files>

Modified: gnucash/trunk/src/app-utils/gnc-gsettings.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-gsettings.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/app-utils/gnc-gsettings.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -203,13 +203,13 @@
         quark = g_quark_from_string (key);
 
     matched = g_signal_handlers_disconnect_matched (
-            schema_ptr,
-            G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA,
-            g_signal_lookup ("changed", G_TYPE_SETTINGS), /* signal_id */
-            quark,   /* signal_detail */
-            NULL, /* closure */
-            G_CALLBACK (func), /* callback function */
-            user_data);
+                  schema_ptr,
+                  G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA,
+                  g_signal_lookup ("changed", G_TYPE_SETTINGS), /* signal_id */
+                  quark,   /* signal_detail */
+                  NULL, /* closure */
+                  G_CALLBACK (func), /* callback function */
+                  user_data);
     LEAVE ("Schema: %s, key: %s - removed %d handlers for 'changed' signal", schema, key, matched);
 }
 
@@ -558,30 +558,35 @@
  */
 static xmlParserInputPtr
 xsltprocExternalEntityLoader(const char *URL, const char *ID,
-                             xmlParserCtxtPtr ctxt) {
+                             xmlParserCtxtPtr ctxt)
+{
     xmlParserInputPtr ret;
     warningSAXFunc warning = NULL;
-        xmlChar *newURL;
+    xmlChar *newURL;
     gchar *tmpdir = g_build_filename (g_get_home_dir (), ".gnc-migration-tmp", NULL);
 
     int i;
     const char *lastsegment = URL;
     const char *iter = URL;
 
-    while (*iter != 0) {
+    while (*iter != 0)
+    {
         if (*iter == '/')
             lastsegment = iter + 1;
         iter++;
     }
 
-    if ((ctxt != NULL) && (ctxt->sax != NULL)) {
+    if ((ctxt != NULL) && (ctxt->sax != NULL))
+    {
         warning = ctxt->sax->warning;
         ctxt->sax->warning = NULL;
     }
 
-    if (defaultEntityLoader != NULL) {
+    if (defaultEntityLoader != NULL)
+    {
         ret = defaultEntityLoader(URL, ID, ctxt);
-        if (ret != NULL) {
+        if (ret != NULL)
+        {
             if (warning != NULL)
                 ctxt->sax->warning = warning;
             return(ret);
@@ -592,9 +597,11 @@
     newURL = xmlStrcat(newURL, (const xmlChar *) "/");
     newURL = xmlStrcat(newURL, (const xmlChar *) lastsegment);
     g_free (tmpdir);
-    if (newURL != NULL) {
+    if (newURL != NULL)
+    {
         ret = defaultEntityLoader((const char *)newURL, ID, ctxt);
-        if (ret != NULL) {
+        if (ret != NULL)
+        {
             if (warning != NULL)
                 ctxt->sax->warning = warning;
             xmlFree(newURL);
@@ -602,7 +609,8 @@
         }
         xmlFree(newURL);
     }
-    if (warning != NULL) {
+    if (warning != NULL)
+    {
         ctxt->sax->warning = warning;
         if (URL != NULL)
             DEBUG ("External entity \"%s\" not loaded", URL);
@@ -698,7 +706,7 @@
     }
 
     command = g_strconcat ("(use-modules (migrate-prefs))(migration-prepare \"",
-                             base_dir, "\")", NULL);
+                           base_dir, "\")", NULL);
     DEBUG ("command = %s", command);
     migration_ok = scm_is_true (scm_c_eval_string (command));
     g_free (command);
@@ -756,7 +764,7 @@
 
     /* All that is left now is to cleanup... */
     command = g_strconcat ("(use-modules (migrate-prefs))(migration-cleanup \"",
-                             base_dir, "\")", NULL);
+                           base_dir, "\")", NULL);
     DEBUG ("command = %s", command);
     migration_ok = scm_is_true (scm_c_eval_string (command));
     g_free (command);

Modified: gnucash/trunk/src/app-utils/gnc-gsettings.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-gsettings.h	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/app-utils/gnc-gsettings.h	2013-10-31 22:22:53 UTC (rev 23358)
@@ -194,8 +194,8 @@
  *  by its handler id.
  */
 void gnc_gsettings_remove_any_cb_by_func (const gchar *schema,
-                                          gpointer func,
-                                          gpointer user_data);
+        gpointer func,
+        gpointer user_data);
 
 
 /** Bind a setting to a g_object property. When this succeeds a change
@@ -327,7 +327,7 @@
  *  returned by this function.
  */
 gchar *gnc_gsettings_get_string (const gchar *schema,
-                                const gchar *key);
+                                 const gchar *key);
 
 /** Get an enum value from GSettings.
  *

Modified: gnucash/trunk/src/app-utils/gnc-prefs-utils.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-prefs-utils.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/app-utils/gnc-prefs-utils.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -57,7 +57,7 @@
     else if (gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_RETAIN_TYPE_DAYS))
         type = XML_RETAIN_DAYS;
     else if (!gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_RETAIN_TYPE_FOREVER))
-            PWARN("no file retention policy was set, assuming conservative policy 'forever'");
+        PWARN("no file retention policy was set, assuming conservative policy 'forever'");
 
     gnc_prefs_set_file_retention_policy (type);
 }

Modified: gnucash/trunk/src/app-utils/gnc-state.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-state.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/app-utils/gnc-state.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -213,10 +213,10 @@
 
     if (state_file_name_pre_241)
         state_file = gnc_key_file_load_from_file (state_file_name_pre_241,
-                                                  TRUE, TRUE, NULL);
+                     TRUE, TRUE, NULL);
     else if (state_file_name)
         state_file = gnc_key_file_load_from_file (state_file_name,
-                                                  TRUE, TRUE, NULL);
+                     TRUE, TRUE, NULL);
 
     return gnc_state_get_current ();
 
@@ -237,7 +237,7 @@
     if (error)
     {
         PERR ("Error: Failure saving state file.\n  %s",
-                   error->message);
+              error->message);
         g_error_free (error);
     }
 }

Modified: gnucash/trunk/src/business/business-gnome/business-gnome-utils.h
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-gnome-utils.h	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/business/business-gnome/business-gnome-utils.h	2013-10-31 22:22:53 UTC (rev 23358)
@@ -56,8 +56,8 @@
 /* Fill in a combo box with the appropriate list of accounts
  * Returns the default selected account */
 Account * gnc_account_select_combo_fill (GtkWidget *combo, QofBook *book,
-                                         GList *acct_types,
-                                         GList *acct_commodities);
+        GList *acct_types,
+        GList *acct_commodities);
 
 /* Returns the currently selected account in the combo box*/
 Account * gnc_account_select_combo_get_active (GtkWidget *combo);

Modified: gnucash/trunk/src/business/business-gnome/dialog-invoice.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-invoice.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/business/business-gnome/dialog-invoice.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -683,7 +683,7 @@
     invoice = iw_get_invoice (iw);
     if (!invoice)
         return FALSE;
-        
+
     ddue_label = _("Due Date");
     post_label = _("Post Date");
     acct_label = _("Post to Account");
@@ -726,7 +726,7 @@
     owner_inst = qofOwnerGetOwner (gncOwnerGetEndOwner (&(iw->owner)));
     kvpf = qof_instance_get_slots (owner_inst);
     *acc = xaccAccountLookup (kvp_frame_get_guid (kvpf, LAST_POSTED_TO_ACCT),
-                             iw->book);
+                              iw->book);
 
     /* Get the default for the accumulate option */
     *accumulate = gnc_prefs_get_bool(GNC_PREFS_GROUP_INVOICE, GNC_PREF_ACCUM_SPLITS);
@@ -736,11 +736,11 @@
             acct_types, acct_commodities, iw->book, iw->terms,
             ddue, postdate, memo, acc, accumulate))
         return FALSE;
-    
+
     return TRUE;
 }
 
-struct post_invoice_params 
+struct post_invoice_params
 {
     Timespec ddue;          /* Due date */
     Timespec postdate;      /* Date posted */
@@ -1746,7 +1746,7 @@
         if (timespec_equal (&ts, &ts_zero))
         {
             gnc_date_edit_set_time (GNC_DATE_EDIT (iw->opened_date),
-				    gnc_time (NULL));
+                                    gnc_time (NULL));
         }
         else
         {
@@ -1786,8 +1786,8 @@
 
     gnc_invoice_id_changed_cb(NULL, iw);
     if (iw->dialog_type == NEW_INVOICE ||
-        iw->dialog_type == DUP_INVOICE ||
-        iw->dialog_type == MOD_INVOICE)
+            iw->dialog_type == DUP_INVOICE ||
+            iw->dialog_type == MOD_INVOICE)
     {
         if (widget)
             gtk_widget_show (widget);
@@ -2786,10 +2786,10 @@
 {
     struct post_invoice_params post_params;
     InvoiceWindow *iw;
-    
+
     if (g_list_length(invoice_list) == 0)
         return;
-        
+
     // Get the posting parameters for these invoices
     iw = gnc_ui_invoice_edit(invoice_list->data);
     if (!gnc_dialog_post_invoice(iw, _("Do you really want to post these invoices?"),
@@ -3198,7 +3198,7 @@
                            len),
                   len);
     dialog = gnc_dialog_query_view_create(param_list, q,
-                                        _("Due Bills Reminder"),
+                                          _("Due Bills Reminder"),
                                           message,
                                           TRUE, FALSE,
                                           1, GTK_SORT_ASCENDING,

Modified: gnucash/trunk/src/business/business-gnome/dialog-order.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-order.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/business/business-gnome/dialog-order.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -473,7 +473,7 @@
         if (timespec_equal (&ts, &ts_zero))
         {
             gnc_date_edit_set_time (GNC_DATE_EDIT (ow->opened_date),
-				    gnc_time (NULL));
+                                    gnc_time (NULL));
         }
         else
         {
@@ -488,7 +488,7 @@
         if (timespec_equal (&ts, &ts_zero))
         {
             gnc_date_edit_set_time (GNC_DATE_EDIT (ow->closed_date),
-				    gnc_time (NULL));
+                                    gnc_time (NULL));
             hide_cd = TRUE;
         }
         else

Modified: gnucash/trunk/src/business/business-gnome/dialog-payment.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-payment.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/business/business-gnome/dialog-payment.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -145,7 +145,7 @@
 void gnc_payment_acct_tree_row_activated_cb (GtkWidget *widget, GtkTreePath *path,
         GtkTreeViewColumn *column, PaymentWindow *pw);
 void gnc_payment_leave_amount_cb (GtkWidget *widget, GdkEventFocus *event,
-        PaymentWindow *pw);
+                                  PaymentWindow *pw);
 
 
 static void
@@ -548,8 +548,8 @@
     amount_deb  = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (pw->amount_debit_edit));
     amount_cred = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (pw->amount_credit_edit));
     amount_tot = gnc_numeric_sub (amount_cred, amount_deb,
-            gnc_commodity_get_fraction (xaccAccountGetCommodity (pw->post_acct)),
-            GNC_HOW_RND_ROUND_HALF_UP);
+                                  gnc_commodity_get_fraction (xaccAccountGetCommodity (pw->post_acct)),
+                                  GNC_HOW_RND_ROUND_HALF_UP);
 
     if (gnc_numeric_check (amount_tot) || gnc_numeric_zero_p (amount_tot))
     {
@@ -693,7 +693,7 @@
 
 void
 gnc_payment_leave_amount_cb (GtkWidget *widget, GdkEventFocus *event,
-        PaymentWindow *pw)
+                             PaymentWindow *pw)
 {
     gnc_numeric amount_deb, amount_cred, amount_tot;
 
@@ -704,8 +704,8 @@
     amount_deb  = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (pw->amount_debit_edit));
     amount_cred = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (pw->amount_credit_edit));
     amount_tot = gnc_numeric_sub (amount_cred, amount_deb,
-            gnc_commodity_get_fraction (xaccAccountGetCommodity (pw->post_acct)),
-            GNC_HOW_RND_ROUND_HALF_UP);
+                                  gnc_commodity_get_fraction (xaccAccountGetCommodity (pw->post_acct)),
+                                  GNC_HOW_RND_ROUND_HALF_UP);
 
     gnc_ui_payment_window_set_amount (pw, amount_tot);
 }

Modified: gnucash/trunk/src/core-utils/gnc-prefs-p.h
===================================================================
--- gnucash/trunk/src/core-utils/gnc-prefs-p.h	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/core-utils/gnc-prefs-p.h	2013-10-31 22:22:53 UTC (rev 23358)
@@ -31,79 +31,79 @@
 
 typedef struct
 {
-        gulong (*register_cb) (const char *group,
+    gulong (*register_cb) (const char *group,
+                           const gchar *pref_name,
+                           gpointer func,
+                           gpointer user_data);
+
+    void (*remove_cb_by_func) (const gchar *group,
                                const gchar *pref_name,
                                gpointer func,
                                gpointer user_data);
 
-        void (*remove_cb_by_func) (const gchar *group,
-                                   const gchar *pref_name,
-                                   gpointer func,
-                                   gpointer user_data);
+    void (*remove_cb_by_id) (const gchar *group,
+                             guint id);
 
-        void (*remove_cb_by_id) (const gchar *group,
-                                 guint id);
+    guint (*register_group_cb) (const gchar *group,
+                                gpointer func,
+                                gpointer user_data);
 
-        guint (*register_group_cb) (const gchar *group,
-                                    gpointer func,
-                                    gpointer user_data);
+    void (*remove_group_cb_by_func) (const gchar *group,
+                                     gpointer func,
+                                     gpointer user_data);
 
-        void (*remove_group_cb_by_func) (const gchar *group,
-                                         gpointer func,
-                                         gpointer user_data);
+    void (*bind) (const gchar *group,
+                  /*@ null @*/ const gchar *pref_name,
+                  gpointer object,
+                  const gchar *property);
 
-        void (*bind) (const gchar *group,
-                          /*@ null @*/ const gchar *pref_name,
-                          gpointer object,
-                          const gchar *property);
+    gboolean (*get_bool) (const gchar *group,
+                          /*@ null @*/ const gchar *pref_name);
 
-        gboolean (*get_bool) (const gchar *group,
-                              /*@ null @*/ const gchar *pref_name);
+    gint (*get_int) (const gchar *group,
+                     const gchar *pref_name);
 
-        gint (*get_int) (const gchar *group,
-                         const gchar *pref_name);
+    gdouble (*get_float) (const gchar *group,
+                          const gchar *pref_name);
 
-        gdouble (*get_float) (const gchar *group,
-                              const gchar *pref_name);
+    gchar *(*get_string) (const gchar *group,
+                          const gchar *pref_name);
 
-        gchar *(*get_string) (const gchar *group,
-                              const gchar *pref_name);
+    gint (*get_enum) (const gchar *group,
+                      const gchar *pref_name);
 
-        gint (*get_enum) (const gchar *group,
-                          const gchar *pref_name);
+    GVariant *(*get_value) (const gchar *group,
+                            const gchar *pref_name);
 
-        GVariant *(*get_value) (const gchar *group,
-                                const gchar *pref_name);
+    gboolean (*set_bool) (const gchar *group,
+                          const gchar *pref_name,
+                          gboolean value);
 
-        gboolean (*set_bool) (const gchar *group,
-                              const gchar *pref_name,
-                              gboolean value);
+    gboolean (*set_int) (const gchar *group,
+                         const gchar *pref_name,
+                         gint value);
 
-        gboolean (*set_int) (const gchar *group,
-                             const gchar *pref_name,
-                             gint value);
+    gboolean (*set_float) (const gchar *group,
+                           const gchar *pref_name,
+                           gdouble value);
 
-        gboolean (*set_float) (const gchar *group,
-                               const gchar *pref_name,
-                               gdouble value);
+    gboolean (*set_string) (const gchar *group,
+                            const gchar *pref_name,
+                            const gchar *value);
 
-        gboolean (*set_string) (const gchar *group,
-                                const gchar *pref_name,
-                                const gchar *value);
+    gboolean (*set_enum) (const gchar *group,
+                          const gchar *pref_name,
+                          gint value);
 
-        gboolean (*set_enum) (const gchar *group,
-                              const gchar *pref_name,
-                              gint value);
+    gboolean (*set_value) (const gchar *group,
+                           const gchar *pref_name,
+                           GVariant *value);
 
-        gboolean (*set_value) (const gchar *group,
-                               const gchar *pref_name,
-                               GVariant *value);
+    void (*reset) (const gchar *group,
+                   const gchar *pref_name);
 
-        void (*reset) (const gchar *group,
-                       const gchar *pref_name);
+    void (*reset_group) (const gchar *group);
 
-        void (*reset_group) (const gchar *group);
-
 } PrefsBackend;
 
 extern PrefsBackend prefsbackend;

Modified: gnucash/trunk/src/core-utils/gnc-prefs.c
===================================================================
--- gnucash/trunk/src/core-utils/gnc-prefs.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/core-utils/gnc-prefs.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -183,9 +183,9 @@
 
 
 void gnc_prefs_bind (const gchar *group,
-                         /*@ null @*/ const gchar *pref_name,
-                         gpointer object,
-                         const gchar *property)
+                     /*@ null @*/ const gchar *pref_name,
+                     gpointer object,
+                     const gchar *property)
 {
     if (prefsbackend.bind)
         (prefsbackend.bind) (group, pref_name, object, property);

Modified: gnucash/trunk/src/core-utils/gnc-prefs.h
===================================================================
--- gnucash/trunk/src/core-utils/gnc-prefs.h	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/core-utils/gnc-prefs.h	2013-10-31 22:22:53 UTC (rev 23358)
@@ -242,9 +242,9 @@
  *  @param property The property of the object to bind to.
  */
 void gnc_prefs_bind (const gchar *group,
-                         /*@ null @*/ const gchar *pref_name,
-                         gpointer object,
-                         const gchar *property);
+                     /*@ null @*/ const gchar *pref_name,
+                     gpointer object,
+                     const gchar *property);
 
 /** @} */
 

Modified: gnucash/trunk/src/engine/gnc-budget.c
===================================================================
--- gnucash/trunk/src/engine/gnc-budget.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/engine/gnc-budget.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -509,7 +509,8 @@
 
     /* Watch out for an off-by-one error here:
      * period_num starts from 0 while num_periods starts from 1 */
-    if (period_num >= GET_PRIVATE(budget)->num_periods) {
+    if (period_num >= GET_PRIVATE(budget)->num_periods)
+    {
         PWARN("Period %i does not exist", period_num);
         return;
     }
@@ -580,7 +581,7 @@
     Timespec ts;
     timespecFromTime64(
         &ts, recurrenceGetPeriodTime(&GET_PRIVATE(budget)->recurrence,
-				     period_num, FALSE));
+                                     period_num, FALSE));
     return ts;
 }
 

Modified: gnucash/trunk/src/engine/gnc-pricedb.c
===================================================================
--- gnucash/trunk/src/engine/gnc-pricedb.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/engine/gnc-pricedb.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -574,11 +574,11 @@
         return FALSE;
 
     if (g_strcmp0 (gnc_price_get_source (p1),
-                     gnc_price_get_source (p2)) != 0)
+                   gnc_price_get_source (p2)) != 0)
         return FALSE;
 
     if (g_strcmp0 (gnc_price_get_typestr (p1),
-                     gnc_price_get_typestr (p2)) != 0)
+                   gnc_price_get_typestr (p2)) != 0)
         return FALSE;
 
     if (!gnc_numeric_eq (gnc_price_get_value (p1),
@@ -2274,12 +2274,12 @@
     cb = (gnc_commodity *) kvpb->key;
 
     cmp_result = g_strcmp0(gnc_commodity_get_namespace(ca),
-                             gnc_commodity_get_namespace(cb));
+                           gnc_commodity_get_namespace(cb));
 
     if (cmp_result != 0) return cmp_result;
 
     return g_strcmp0(gnc_commodity_get_mnemonic(ca),
-                       gnc_commodity_get_mnemonic(cb));
+                     gnc_commodity_get_mnemonic(cb));
 }
 
 static gboolean

Modified: gnucash/trunk/src/engine/gncInvoice.h
===================================================================
--- gnucash/trunk/src/engine/gncInvoice.h	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/engine/gncInvoice.h	2013-10-31 22:22:53 UTC (rev 23358)
@@ -219,9 +219,9 @@
  */
 void
 gncInvoiceApplyPayment (const GncInvoice *invoice, Transaction *txn,
-                      Account *xfer_acc, gnc_numeric amount,
-                      gnc_numeric exch, Timespec date,
-                      const char *memo, const char *num);
+                        Account *xfer_acc, gnc_numeric amount,
+                        gnc_numeric exch, Timespec date,
+                        const char *memo, const char *num);
 
 
 /** Given a transaction, find and return the Invoice */

Modified: gnucash/trunk/src/engine/gncOwner.c
===================================================================
--- gnucash/trunk/src/engine/gncOwner.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/engine/gncOwner.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -807,7 +807,7 @@
         {
             /* Need to value the payment in terms of the owner commodity */
             gnc_numeric payment_value = gnc_numeric_mul(amount,
-                    exch, GNC_DENOM_AUTO, GNC_HOW_RND_ROUND_HALF_UP);
+                                        exch, GNC_DENOM_AUTO, GNC_HOW_RND_ROUND_HALF_UP);
 
             xaccSplitSetAmount(split, amount);
             xaccSplitSetValue(split, payment_value);
@@ -1041,7 +1041,7 @@
         selected_lots = lots;
     else
         selected_lots = xaccAccountFindOpenLots (posted_acc, gncOwnerLotMatchOwnerFunc,
-                                                 (gpointer)owner, NULL);
+                        (gpointer)owner, NULL);
 
     /* And link the selected lots and the payment lot together as well as possible.
      * If the payment was bigger than the selected documents/overpayments, only

Modified: gnucash/trunk/src/engine/gncTaxTable.c
===================================================================
--- gnucash/trunk/src/engine/gncTaxTable.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/engine/gncTaxTable.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -249,11 +249,11 @@
         g_value_set_string(value, tt->name);
         break;
     case PROP_INVISIBLE:
-    	g_value_set_boolean(value, tt->invisible);
-    	break;
+        g_value_set_boolean(value, tt->invisible);
+        break;
     case PROP_REFCOUNT:
-    	g_value_set_uint64(value, tt->refcount);
-    	break;
+        g_value_set_uint64(value, tt->refcount);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
@@ -277,14 +277,14 @@
         gncTaxTableSetName(tt, g_value_get_string(value));
         break;
     case PROP_INVISIBLE:
-    	if (g_value_get_boolean(value))
-    	{
+        if (g_value_get_boolean(value))
+        {
             gncTaxTableMakeInvisible(tt);
-    	}
-    	break;
+        }
+        break;
     case PROP_REFCOUNT:
-    	gncTaxTableSetRefcount(tt, g_value_get_uint64(value));
-    	break;
+        gncTaxTableSetRefcount(tt, g_value_get_uint64(value));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;

Modified: gnucash/trunk/src/gnome/assistant-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-hierarchy.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/assistant-hierarchy.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -907,7 +907,7 @@
 
     /* Now build a new account tree */
     data->final_account_tree
-    = GNC_TREE_VIEW_ACCOUNT(gnc_tree_view_account_new_with_root (data->our_account_tree, FALSE));
+        = GNC_TREE_VIEW_ACCOUNT(gnc_tree_view_account_new_with_root (data->our_account_tree, FALSE));
     tree_view = GTK_TREE_VIEW(data->final_account_tree);
     gnc_tree_view_account_set_name_edited(data->final_account_tree,
                                           gnc_tree_view_account_name_edited_cb);

Modified: gnucash/trunk/src/gnome/dialog-lot-viewer.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-lot-viewer.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/dialog-lot-viewer.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -513,7 +513,7 @@
 
         /* Num  - retrieve number based on book option */
         gtk_list_store_set (store, &iter, SPLIT_COL_NUM,
-                                        gnc_get_num_action (trans, split), -1);
+                            gnc_get_num_action (trans, split), -1);
 
         /* Description */
         gtk_list_store_set (store, &iter, SPLIT_COL_DESCRIPTION, xaccTransGetDescription (trans), -1);

Modified: gnucash/trunk/src/gnome/dialog-print-check.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/dialog-print-check.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -555,38 +555,38 @@
 
     /* Custom format page */
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_PAYEE,
-                    gtk_spin_button_get_value(pcd->payee_x),
-                    gtk_spin_button_get_value(pcd->payee_y));
+                         gtk_spin_button_get_value(pcd->payee_x),
+                         gtk_spin_button_get_value(pcd->payee_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_DATE,
-                    gtk_spin_button_get_value(pcd->date_x),
-                    gtk_spin_button_get_value(pcd->date_y));
+                         gtk_spin_button_get_value(pcd->date_x),
+                         gtk_spin_button_get_value(pcd->date_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_WORDS,
-                    gtk_spin_button_get_value(pcd->words_x),
-                    gtk_spin_button_get_value(pcd->words_y));
+                         gtk_spin_button_get_value(pcd->words_x),
+                         gtk_spin_button_get_value(pcd->words_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_NUMBER,
-                    gtk_spin_button_get_value(pcd->number_x),
-                    gtk_spin_button_get_value(pcd->number_y));
+                         gtk_spin_button_get_value(pcd->number_x),
+                         gtk_spin_button_get_value(pcd->number_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_NOTES,
-                    gtk_spin_button_get_value(pcd->notes_x),
-                    gtk_spin_button_get_value(pcd->notes_y));
+                         gtk_spin_button_get_value(pcd->notes_x),
+                         gtk_spin_button_get_value(pcd->notes_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_MEMO,
-                    gtk_spin_button_get_value(pcd->memo_x),
-                    gtk_spin_button_get_value(pcd->memo_y));
+                         gtk_spin_button_get_value(pcd->memo_x),
+                         gtk_spin_button_get_value(pcd->memo_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_ADDRESS,
-                    gtk_spin_button_get_value(pcd->address_x),
-                    gtk_spin_button_get_value(pcd->address_y));
+                         gtk_spin_button_get_value(pcd->address_x),
+                         gtk_spin_button_get_value(pcd->address_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_SPLITS_AMOUNT,
-                    gtk_spin_button_get_value(pcd->splits_amount_x),
-                    gtk_spin_button_get_value(pcd->splits_amount_y));
+                         gtk_spin_button_get_value(pcd->splits_amount_x),
+                         gtk_spin_button_get_value(pcd->splits_amount_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_SPLITS_MEMO,
-                    gtk_spin_button_get_value(pcd->splits_memo_x),
-                    gtk_spin_button_get_value(pcd->splits_memo_y));
+                         gtk_spin_button_get_value(pcd->splits_memo_x),
+                         gtk_spin_button_get_value(pcd->splits_memo_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_SPLITS_ACCOUNT,
-                    gtk_spin_button_get_value(pcd->splits_account_x),
-                    gtk_spin_button_get_value(pcd->splits_account_y));
+                         gtk_spin_button_get_value(pcd->splits_account_x),
+                         gtk_spin_button_get_value(pcd->splits_account_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_TRANSLATION,
-                    gtk_spin_button_get_value(pcd->translation_x),
-                    gtk_spin_button_get_value(pcd->translation_y));
+                         gtk_spin_button_get_value(pcd->translation_x),
+                         gtk_spin_button_get_value(pcd->translation_y));
     gnc_prefs_set_float(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_ROTATION,
                         gtk_spin_button_get_value(pcd->check_rotation));
     active = gtk_combo_box_get_active(GTK_COMBO_BOX(pcd->units_combobox));
@@ -2102,9 +2102,9 @@
         switch (item->type)
         {
         case DATE:
-	{
-	    GDate date;
-	    g_date_clear (&date, 1);
+        {
+            GDate date;
+            g_date_clear (&date, 1);
             gnc_gdate_set_time64 (&date, xaccTransGetDate(trans));
             date_format =
                 gnc_date_format_get_custom(GNC_DATE_FORMAT
@@ -2113,7 +2113,7 @@
             width = draw_text(context, buf, item, default_desc);
             draw_date_format(context, date_format, item, default_desc, width);
             break;
-	}
+        }
 
         case PAYEE:
             draw_text(context, xaccTransGetDescription(trans), item, default_desc);
@@ -2129,12 +2129,12 @@
 
         case ACTION:
             draw_text(context, gnc_get_action_num(trans, pcd->split), item,
-                                                                default_desc);
+                      default_desc);
             break;
 
         case CHECK_NUMBER:
             draw_text(context, gnc_get_num_action(trans, pcd->split), item,
-                                                                default_desc);
+                      default_desc);
             break;
 
         case AMOUNT_NUMBER:

Modified: gnucash/trunk/src/gnome/dialog-print-check2.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check2.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/dialog-print-check2.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -555,38 +555,38 @@
 
     /* Custom format page */
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_PAYEE,
-                    gtk_spin_button_get_value(pcd->payee_x),
-                    gtk_spin_button_get_value(pcd->payee_y));
+                         gtk_spin_button_get_value(pcd->payee_x),
+                         gtk_spin_button_get_value(pcd->payee_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_DATE,
-                    gtk_spin_button_get_value(pcd->date_x),
-                    gtk_spin_button_get_value(pcd->date_y));
+                         gtk_spin_button_get_value(pcd->date_x),
+                         gtk_spin_button_get_value(pcd->date_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_WORDS,
-                    gtk_spin_button_get_value(pcd->words_x),
-                    gtk_spin_button_get_value(pcd->words_y));
+                         gtk_spin_button_get_value(pcd->words_x),
+                         gtk_spin_button_get_value(pcd->words_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_NUMBER,
-                    gtk_spin_button_get_value(pcd->number_x),
-                    gtk_spin_button_get_value(pcd->number_y));
+                         gtk_spin_button_get_value(pcd->number_x),
+                         gtk_spin_button_get_value(pcd->number_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_NOTES,
-                    gtk_spin_button_get_value(pcd->notes_x),
-                    gtk_spin_button_get_value(pcd->notes_y));
+                         gtk_spin_button_get_value(pcd->notes_x),
+                         gtk_spin_button_get_value(pcd->notes_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_MEMO,
-                    gtk_spin_button_get_value(pcd->memo_x),
-                    gtk_spin_button_get_value(pcd->memo_y));
+                         gtk_spin_button_get_value(pcd->memo_x),
+                         gtk_spin_button_get_value(pcd->memo_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_ADDRESS,
-                    gtk_spin_button_get_value(pcd->address_x),
-                    gtk_spin_button_get_value(pcd->address_y));
+                         gtk_spin_button_get_value(pcd->address_x),
+                         gtk_spin_button_get_value(pcd->address_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_SPLITS_AMOUNT,
-                    gtk_spin_button_get_value(pcd->splits_amount_x),
-                    gtk_spin_button_get_value(pcd->splits_amount_y));
+                         gtk_spin_button_get_value(pcd->splits_amount_x),
+                         gtk_spin_button_get_value(pcd->splits_amount_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_SPLITS_MEMO,
-                    gtk_spin_button_get_value(pcd->splits_memo_x),
-                    gtk_spin_button_get_value(pcd->splits_memo_y));
+                         gtk_spin_button_get_value(pcd->splits_memo_x),
+                         gtk_spin_button_get_value(pcd->splits_memo_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_SPLITS_ACCOUNT,
-                    gtk_spin_button_get_value(pcd->splits_account_x),
-                    gtk_spin_button_get_value(pcd->splits_account_y));
+                         gtk_spin_button_get_value(pcd->splits_account_x),
+                         gtk_spin_button_get_value(pcd->splits_account_y));
     gnc_prefs_set_coords(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_TRANSLATION,
-                    gtk_spin_button_get_value(pcd->translation_x),
-                    gtk_spin_button_get_value(pcd->translation_y));
+                         gtk_spin_button_get_value(pcd->translation_x),
+                         gtk_spin_button_get_value(pcd->translation_y));
     gnc_prefs_set_float(GNC_PREFS_GROUP, GNC_PREF_CUSTOM_ROTATION,
                         gtk_spin_button_get_value(pcd->check_rotation));
     active = gtk_combo_box_get_active(GTK_COMBO_BOX(pcd->units_combobox));
@@ -1599,7 +1599,7 @@
  *****************************************************/
 void
 gnc_ui_print_check_dialog_create2(GncPluginPageRegister2 *plugin_page,
-                                 GList *splits)
+                                  GList *splits)
 {
     PrintCheckDialog *pcd;
     GtkBuilder *builder;
@@ -2102,9 +2102,9 @@
         switch (item->type)
         {
         case DATE:
-	{
-	    GDate date;
-	    g_date_clear (&date, 1);
+        {
+            GDate date;
+            g_date_clear (&date, 1);
             gnc_gdate_set_time64 (&date, xaccTransGetDate(trans));
             date_format =
                 gnc_date_format_get_custom(GNC_DATE_FORMAT
@@ -2113,7 +2113,7 @@
             width = draw_text(context, buf, item, default_desc);
             draw_date_format(context, date_format, item, default_desc, width);
             break;
-	}
+        }
 
         case PAYEE:
             draw_text(context, xaccTransGetDescription(trans), item, default_desc);
@@ -2129,12 +2129,12 @@
 
         case ACTION:
             draw_text(context, gnc_get_action_num(trans, pcd->split), item,
-                                                                default_desc);
+                      default_desc);
             break;
 
         case CHECK_NUMBER:
             draw_text(context, gnc_get_num_action(trans, pcd->split), item,
-                                                                default_desc);
+                      default_desc);
             break;
 
         case AMOUNT_NUMBER:
@@ -2507,7 +2507,7 @@
 
 void
 gnc_print_check_format_changed2 (GtkComboBox *widget,
-                                PrintCheckDialog *pcd)
+                                 PrintCheckDialog *pcd)
 {
     GtkListStore *p_store;
     GtkTreeModel *f_model;
@@ -2587,7 +2587,7 @@
 
 void
 gnc_print_check_position_changed2 (GtkComboBox *widget,
-                                  PrintCheckDialog *pcd)
+                                   PrintCheckDialog *pcd)
 {
     gboolean sensitive;
     gint pnum;
@@ -2618,8 +2618,8 @@
 
 void
 gnc_ui_print_check_response_cb2(GtkDialog *dialog,
-                               gint response,
-                               PrintCheckDialog *pcd)
+                                gint response,
+                                PrintCheckDialog *pcd)
 {
     switch (response)
     {

Modified: gnucash/trunk/src/gnome/dialog-print-check2.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check2.h	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/dialog-print-check2.h	2013-10-31 22:22:53 UTC (rev 23358)
@@ -29,6 +29,6 @@
 typedef struct _print_check_dialog PrintCheckDialog;
 
 void gnc_ui_print_check_dialog_create2 (GncPluginPageRegister2 *plugin_page,
-                                      GList *splits);
+                                        GList *splits);
 
 #endif

Modified: gnucash/trunk/src/gnome/dialog-sx-since-last-run.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-since-last-run.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/dialog-sx-since-last-run.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -1027,12 +1027,12 @@
     }
     query = qof_query_merge(book_query, guid_query, QOF_QUERY_AND);
 #ifdef REGISTER2_ENABLED
-/*################## Added for Reg2 #################*/
+    /*################## Added for Reg2 #################*/
     // inspired by dialog-find-transactions:do_find_cb:
     ledger = gnc_ledger_display2_query(query, SEARCH_LEDGER2, REG2_STYLE_JOURNAL);
     gnc_ledger_display2_refresh(ledger);
     page = gnc_plugin_page_register2_new_ledger(ledger);
-/*################## Added for Reg2 #################*/
+    /*################## Added for Reg2 #################*/
 #else
     // inspired by dialog-find-transactions:do_find_cb:
     ledger = gnc_ledger_display_query(query, SEARCH_LEDGER, REG_STYLE_JOURNAL);

Modified: gnucash/trunk/src/gnome/dialog-tax-info.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-tax-info.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/dialog-tax-info.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -632,7 +632,7 @@
         index = g_list_index (infos, info);
 
     if (index < 0)
-	index = 0;
+        index = 0;
 
     view = GTK_TREE_VIEW(ti_dialog->txf_category_view);
     selection = gtk_tree_view_get_selection(view);

Modified: gnucash/trunk/src/gnome/gnc-budget-view.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-budget-view.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/gnc-budget-view.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -82,7 +82,8 @@
     GtkVBoxClass w;
 };
 
-enum {
+enum
+{
     TOTALS_TYPE_INCOME,
     TOTALS_TYPE_EXPENSES,
     TOTALS_TYPE_TRANSFERS,
@@ -112,7 +113,7 @@
 #endif
 static void gbv_treeview_resized_cb(GtkWidget* widget, GtkAllocation* allocation, GncBudgetView* view);
 static gnc_numeric gbv_get_accumulated_budget_amount(GncBudget* budget,
-                                       Account* account, guint period_num);
+        Account* account, guint period_num);
 
 struct GncBudgetViewPrivate
 {
@@ -509,7 +510,7 @@
  **********************************************************************/
 static gboolean
 gbv_button_press_cb(GtkWidget *widget, GdkEventButton *event,
-                     GncBudgetView *view)
+                    GncBudgetView *view)
 {
     gboolean result;
 
@@ -744,7 +745,7 @@
             if (gnc_account_n_children(account) != 0)
             {
                 numeric = gbv_get_accumulated_budget_amount(budget, account, period_num);
-		total = gnc_numeric_add(total, numeric, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+                total = gnc_numeric_add(total, numeric, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
             }
         }
         else
@@ -752,7 +753,7 @@
             numeric = gnc_budget_get_account_period_value(budget, account, period_num);
             if (!gnc_numeric_check(numeric))
             {
-		total = gnc_numeric_add(total, numeric, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+                total = gnc_numeric_add(total, numeric, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
             }
         }
     }
@@ -865,7 +866,7 @@
             assets = bgv_get_total_for_account(priv->assets, budget);
             liabilities = bgv_get_total_for_account(priv->liabilities, budget);
         }
-	value = gnc_numeric_sub(assets, liabilities, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+        value = gnc_numeric_sub(assets, liabilities, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
         xaccSPrintAmount(amtbuff, value,
                          gnc_account_print_info(priv->assets, FALSE));
         g_object_set(cell, "foreground", "black", NULL);
@@ -891,9 +892,9 @@
             assets = bgv_get_total_for_account(priv->assets, budget);
             liabilities = bgv_get_total_for_account(priv->liabilities, budget);
         }
-	value = gnc_numeric_sub(income, expenses, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
-	value = gnc_numeric_sub(value, assets, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
-	value = gnc_numeric_add(value, liabilities, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+        value = gnc_numeric_sub(income, expenses, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+        value = gnc_numeric_sub(value, assets, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+        value = gnc_numeric_add(value, liabilities, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
         xaccSPrintAmount(amtbuff, value,
                          gnc_account_print_info(priv->assets, FALSE));
         if (gnc_numeric_negative_p(value))
@@ -1075,7 +1076,7 @@
         col = gbv_create_totals_column(view, -1);
         if (col != NULL)
         {
-           gtk_tree_view_append_column(priv->totals_tree_view, col);
+            gtk_tree_view_append_column(priv->totals_tree_view, col);
         }
     }
 

Modified: gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -626,9 +626,9 @@
 {
 
 #ifdef REGISTER2_ENABLED
-/*################## Added for Reg2 #################*/
+    /*################## Added for Reg2 #################*/
     gnc_ui_find_transactions_dialog_create2 (NULL);
-/*################## Added for Reg2 #################*/
+    /*################## Added for Reg2 #################*/
 #else
     gnc_ui_find_transactions_dialog_create (NULL);
 #endif

Modified: gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -837,8 +837,8 @@
 /*        New Register Common                        */
 static void
 gppat_open2_account_common (GncPluginPageAccountTree *page,
-                           Account *account,
-                           gboolean include_subs)
+                            Account *account,
+                            gboolean include_subs)
 {
     GtkWidget *window;
     GncPluginPage *new_page;
@@ -854,9 +854,9 @@
 
 static void
 gnc_plugin_page_account_tree_double_click_cb (GtkTreeView *treeview,
-                                              GtkTreePath        *path,
-                                              GtkTreeViewColumn  *col,
-                                              GncPluginPageAccountTree *page)
+        GtkTreePath        *path,
+        GtkTreeViewColumn  *col,
+        GncPluginPageAccountTree *page)
 {
     GtkTreeModel *model;
     GtkTreeIter iter;

Modified: gnucash/trunk/src/gnome/gnc-plugin-page-budget.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-budget.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-budget.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -388,7 +388,7 @@
             if (ei->event_mask & QOF_EVENT_MODIFY)
             {
                 DEBUG("refreshing budget view because budget was modified");
-		gnc_budget_view_refresh(priv->budget_view);
+                gnc_budget_view_refresh(priv->budget_view);
             }
         }
     }

Modified: gnucash/trunk/src/gnome/top-level.c
===================================================================
--- gnucash/trunk/src/gnome/top-level.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/top-level.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -317,7 +317,7 @@
         for (curr=0; curr < num_groups; curr++)
         {
             if (g_str_has_prefix (groups[curr], "Window ") ||
-                g_str_has_prefix (groups[curr], "Page "))
+                    g_str_has_prefix (groups[curr], "Page "))
             {
                 DEBUG ("Removing state group %s", groups[curr]);
                 g_key_file_remove_group (keyfile, groups[curr], NULL);

Modified: gnucash/trunk/src/gnome/window-reconcile.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome/window-reconcile.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -852,7 +852,7 @@
 
 static void
 gnc_reconcile_window_toggled_cb(GNCReconcileView *view, Split *split,
-                             gpointer data)
+                                gpointer data)
 {
     RecnWindow *recnData = data;
     gnc_reconcile_window_set_sensitivity(recnData);
@@ -862,7 +862,7 @@
 
 static void
 gnc_reconcile_window_row_cb(GNCReconcileView *view, gpointer item,
-                             gpointer data)
+                            gpointer data)
 {
     RecnWindow *recnData = data;
     gnc_reconcile_window_set_sensitivity(recnData);
@@ -951,9 +951,9 @@
 
         /* Get tree path for row that was clicked */
         gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(qview),
-                                             (gint) event->x, 
-                                             (gint) event->y,
-                                             &path, NULL, NULL, NULL);
+                                      (gint) event->x,
+                                      (gint) event->y,
+                                      &path, NULL, NULL, NULL);
 
         selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(qview));
         gtk_tree_selection_select_path(selection, path);
@@ -1423,7 +1423,7 @@
             if (was_last_day_of_month)
             {
                 g_date_set_day (&date, g_date_get_days_in_month(g_date_get_month(&date),
-                               g_date_get_year( &date)));
+                                g_date_get_year( &date)));
             }
         }
         else
@@ -1431,7 +1431,7 @@
             g_date_add_days (&date, days);
         }
 
-	*statement_date = gnc_time64_get_day_end_gdate (&date);
+        *statement_date = gnc_time64_get_day_end_gdate (&date);
 
         today = gnc_time64_get_day_end (gnc_time (NULL));
         if (*statement_date > today)

Modified: gnucash/trunk/src/gnome-utils/dialog-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-commodity.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/dialog-commodity.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -597,9 +597,9 @@
                             NULL);
 
     if ((offset < cw->comm_section_top) || (offset >= cw->comm_section_bottom))
-	return;
+        return;
     if (cw->is_currency)
-	gtk_widget_set_sensitive(widget, offset == cw->comm_symbol_line);
+        gtk_widget_set_sensitive(widget, offset == cw->comm_symbol_line);
 }
 
 static void
@@ -1303,7 +1303,7 @@
         {
             gboolean quote_set;
             quote_set = gtk_toggle_button_get_active
-                (GTK_TOGGLE_BUTTON (w->get_quote_check));
+                        (GTK_TOGGLE_BUTTON (w->get_quote_check));
             c = w->edit_commodity;
             gnc_commodity_begin_edit(c);
             gnc_commodity_user_set_quote_flag (c, quote_set);
@@ -1312,12 +1312,13 @@
                 selection = gtk_combo_box_get_active(GTK_COMBO_BOX(w->quote_tz_menu));
                 string = gnc_timezone_menu_position_to_string(selection);
                 gnc_commodity_set_quote_tz(c, string);
-            } else
+            }
+            else
                 gnc_commodity_set_quote_tz(c, NULL);
 
-	    if (user_symbol && *user_symbol)
+            if (user_symbol && *user_symbol)
                 gnc_commodity_set_user_symbol(c, user_symbol);
-	    else
+            else
                 gnc_commodity_set_user_symbol(c, NULL);
 
             gnc_commodity_commit_edit(c);

Modified: gnucash/trunk/src/gnome-utils/dialog-dup-trans.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-dup-trans.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/dialog-dup-trans.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -187,7 +187,7 @@
     dt_dialog = g_new0 (DupTransDialog, 1);
 
     gnc_dup_trans_dialog_create (parent, dt_dialog, show_date,
-                                    *date_p, num, tnum);
+                                 *date_p, num, tnum);
 
     if (!show_date)
     {
@@ -270,7 +270,7 @@
                       const char *tnum, char **out_tnum)
 {
     return gnc_dup_trans_dialog_internal(parent, title, show_date, date_p, NULL,
-                                            num, out_num, tnum, out_tnum);
+                                         num, out_num, tnum, out_tnum);
 }
 
 gboolean
@@ -282,7 +282,7 @@
 
     tmp_time = timespecToTime64(gdate_to_timespec(*gdate_p));
     return gnc_dup_trans_dialog_internal(parent, NULL, TRUE, &tmp_time, gdate_p,
-                                            num, out_num, NULL, NULL);
+                                         num, out_num, NULL, NULL);
 }
 
 gboolean
@@ -293,5 +293,5 @@
 
     tmp_time = timespecToTime64(gdate_to_timespec(*gdate_p));
     return gnc_dup_trans_dialog_internal(parent, title, TRUE, &tmp_time, gdate_p,
-                                            NULL, NULL, NULL, NULL);
+                                         NULL, NULL, NULL, NULL);
 }

Modified: gnucash/trunk/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/dialog-options.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -487,11 +487,11 @@
         g_return_val_if_fail(num_values >= 0, NULL);
 
         {
-        /* GtkComboBox still does not support per-item tooltips, so have
-           created a basic one called Combott implemented in gnc-combott.
-           Have highlighted changes in this file with comments for when  
-           the feature of per-item tooltips is implemented in gtk,
-           see http://bugzilla.gnome.org/show_bug.cgi?id=303717 */
+            /* GtkComboBox still does not support per-item tooltips, so have
+               created a basic one called Combott implemented in gnc-combott.
+               Have highlighted changes in this file with comments for when
+               the feature of per-item tooltips is implemented in gtk,
+               see http://bugzilla.gnome.org/show_bug.cgi?id=303717 */
 
             GtkListStore *store;
             GtkTreeIter  iter;
@@ -595,7 +595,7 @@
     {
         /* GtkComboBox still does not support per-item tooltips, so have
            created a basic one called Combott implemented in gnc-combott.
-           Have highlighted changes in this file with comments for when  
+           Have highlighted changes in this file with comments for when
            the feature of per-item tooltips is implemented in gtk,
            see http://bugzilla.gnome.org/show_bug.cgi?id=303717 */
         GtkListStore *store;
@@ -610,7 +610,7 @@
             itemstring = gnc_option_permissible_value_name(option, i);
             description = gnc_option_permissible_value_description(option, i);
             gtk_list_store_append (store, &iter);
-            gtk_list_store_set (store, &iter, 0, 
+            gtk_list_store_set (store, &iter, 0,
                                 (itemstring && *itemstring) ? _(itemstring) : "", 1,
                                 (description && *description) ? _(description) : "", -1);
             if (itemstring)
@@ -1453,7 +1453,7 @@
 
         apply_button = GTK_WIDGET(gtk_builder_get_object (builder, "applybutton"));
         gtk_widget_hide (apply_button);
-    } 
+    }
 
     /* glade doesn't suport a notebook with zero pages */
     hbox = GTK_WIDGET(gtk_builder_get_object (builder, "notebook placeholder"));

Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -213,18 +213,18 @@
 
     /* grab the price on the same day or nearest to the DATE out of the pricedb */
     date = gnc_date_edit_get_date_ts (GNC_DATE_EDIT (xferData->date_entry));
-    
+
     /* Look for a price on the same day or, failing that, closest in time. */
     prc = gnc_pricedb_lookup_day (xferData->pricedb, from, to, date);
     reverse = FALSE;
-    
-    if (!prc) 
+
+    if (!prc)
     {
         /* Look for reverse price on same day */
         prc = gnc_pricedb_lookup_day (xferData->pricedb, to, from, date);
         reverse = TRUE;
     }
-    
+
     if (!prc)
     {
         /* Didn't find one on the same day, look for nearest in time */
@@ -232,7 +232,7 @@
                 to, date);
         reverse = FALSE;
     }
-    
+
     if (!prc)
     {
         prc = gnc_pricedb_lookup_nearest_in_time (xferData->pricedb, to,
@@ -242,7 +242,7 @@
 
     if (!prc)
         return;
-        
+
     /* grab the price from the pricedb */
     price = gnc_price_get_value (prc);
     if (reverse)
@@ -536,7 +536,7 @@
     GtkBuilder *builder = g_object_get_data (G_OBJECT (xferData->dialog), "builder");
 
     use_accounting_labels = gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL,
-                                               GNC_PREF_ACCOUNTING_LABELS);
+                            GNC_PREF_ACCOUNTING_LABELS);
 
     /* In "normal" mode (non accounting terms) the account where the
      * money comes from is displayed on the left side and the account
@@ -1310,7 +1310,7 @@
     gnc_date_edit_set_time( GNC_DATE_EDIT(xferData->date_entry), set_date );
 }
 void gnc_xfer_dialog_set_date_sensitive(XferDialog *xferData,
-        gboolean is_sensitive)
+                                        gboolean is_sensitive)
 {
     g_assert(xferData);
     gtk_widget_set_sensitive (xferData->date_entry, is_sensitive);
@@ -1561,7 +1561,7 @@
 
             from_amt = gnc_amount_edit_get_amount(GNC_AMOUNT_EDIT(xferData->amount_edit));
             to_amt = gnc_amount_edit_get_amount(GNC_AMOUNT_EDIT(xferData->to_amount_edit));
-        
+
             /* compute the price -- maybe we need to swap? */
 
             value = gnc_numeric_div(to_amt, from_amt, GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
@@ -1569,7 +1569,7 @@
 
             /* Try to be consistent about how quotes are installed. */
             if (from == gnc_default_currency() ||
-                ((to != gnc_default_currency()) &&
+                    ((to != gnc_default_currency()) &&
                      (strcmp (gnc_commodity_get_mnemonic(from),
                               gnc_commodity_get_mnemonic(to)) < 0)))
             {
@@ -1582,7 +1582,7 @@
                 value = gnc_numeric_div (gnc_numeric_create(1, 1), value,
                                          GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
             }
-            
+
             /* First see if the closest entry on the same day has an equivalent rate */
             price = gnc_pricedb_lookup_day (xferData->pricedb, from, to, ts);
             if (price)
@@ -1599,13 +1599,13 @@
                                                    GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
                 }
             }
-            
+
             /* See if we found a good enough price */
             if (price)
             {
                 int scu = gnc_commodity_get_fraction (to);
                 if (!gnc_numeric_equal (gnc_numeric_mul (from_amt, price_value,
-                                            scu, GNC_HOW_RND_ROUND_HALF_UP),
+                                        scu, GNC_HOW_RND_ROUND_HALF_UP),
                                         to_amt))
                 {
                     gnc_price_unref (price);
@@ -1748,7 +1748,7 @@
         if (prc)
         {
             rate = gnc_numeric_div (gnc_numeric_create (1, 1), gnc_price_get_value (prc),
-                                 GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
+                                    GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
 
             gnc_amount_edit_set_amount(GNC_AMOUNT_EDIT(xferData->price_edit), rate);
             gnc_price_unref (prc);
@@ -1767,7 +1767,7 @@
     gboolean  use_accounting_labels;
 
     use_accounting_labels = gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL,
-                                               GNC_PREF_ACCOUNTING_LABELS);
+                            GNC_PREF_ACCOUNTING_LABELS);
 
     ENTER(" ");
     builder = gtk_builder_new();
@@ -2311,8 +2311,8 @@
     if (xaccTransUseTradingAccounts (txn))
     {
         /* If we're using commodity trading accounts then "amount" is
-           really the split's amount and it's in xfer_com commodity.  
-           We need an exchange rate that will convert this amount 
+           really the split's amount and it's in xfer_com commodity.
+           We need an exchange rate that will convert this amount
            into a value in the transaction currency.  */
         if (gnc_commodity_equal(xfer_com, txn_cur))
         {

Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -138,10 +138,10 @@
         gint screen_height = gdk_screen_height();
 
         g_variant_get (geometry, "(iiii)",
-                                 &wpos[0],  &wpos[1],
-                                 &wsize[0], &wsize[1]);
+                       &wpos[0],  &wpos[1],
+                       &wsize[0], &wsize[1]);
         DEBUG("geometry from preferences - wpos[0]: %d, wpos[1]: %d, wsize[0]: %d, wsize[1]: %d",
-                wpos[0],  wpos[1], wsize[0], wsize[1]);
+              wpos[0],  wpos[1], wsize[0], wsize[1]);
 
         /* (-1, -1) means no geometry was saved (default preferences value) */
         if ((wpos[0] != -1) && (wpos[1] != -1))
@@ -152,7 +152,7 @@
             if (screen_height != 0)
                 wpos[1] = wpos[1] % screen_height;
             DEBUG("geometry after screen adaption - wpos[0]: %d, wpos[1]: %d, wsize[0]: %d, wsize[1]: %d",
-                    wpos[0],  wpos[1], wsize[0], wsize[1]);
+                  wpos[0],  wpos[1], wsize[0], wsize[1]);
 
             gtk_window_move(window, wpos[0], wpos[1]);
         }
@@ -192,7 +192,7 @@
     gtk_window_get_position(GTK_WINDOW(window), &wpos[0], &wpos[1]);
     gtk_window_get_size(GTK_WINDOW(window), &wsize[0], &wsize[1]);
     geometry = g_variant_new ("(iiii)", wpos[0],  wpos[1],
-                                        wsize[0], wsize[1]);
+                              wsize[0], wsize[1]);
     gnc_prefs_set_value (group, GNC_PREF_LAST_GEOMETRY, geometry);
     /* Don't unref geometry here, it is consumed by gnc_prefs_set_value */
 }
@@ -477,7 +477,7 @@
                               user_data, NULL , flags);
 }
 /*--------------------------------------------------------------------------
- * End of GtkBuilder utilities 
+ * End of GtkBuilder utilities
  *-------------------------------------------------------------------------*/
 
 

Modified: gnucash/trunk/src/gnome-utils/gnc-cell-renderer-date.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-cell-renderer-date.h	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-cell-renderer-date.h	2013-10-31 22:22:53 UTC (rev 23358)
@@ -49,19 +49,19 @@
 
 struct _GncCellRendererDate
 {
-	GncCellRendererPopup      parent;
-	GtkWidget                *calendar;
-	GtkWidget                *today_button;
+    GncCellRendererPopup      parent;
+    GtkWidget                *calendar;
+    GtkWidget                *today_button;
 
-	time64                    time;
-        gboolean                  use_buttons;
-	GtkWidget                *button_box;
+    time64                    time;
+    gboolean                  use_buttons;
+    GtkWidget                *button_box;
 
 };
 
 struct _GncCellRendererDateClass
 {
-	GncCellRendererPopupClass parent_class;
+    GncCellRendererPopupClass parent_class;
 };
 
 GType            gnc_cell_renderer_date_get_type (void) G_GNUC_CONST;

Modified: gnucash/trunk/src/gnome-utils/gnc-cell-renderer-popup-entry.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-cell-renderer-popup-entry.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-cell-renderer-popup-entry.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -41,16 +41,18 @@
 static void     gnc_popup_entry_class_init (GncPopupEntryClass   *class);
 static void     gpw_cell_editable_init     (GtkCellEditableIface *iface);
 static gboolean gpw_key_press_event        (GtkWidget            *box,
-					    GdkEventKey          *key_event);
+        GdkEventKey          *key_event);
 
-enum {
-	ARROW_CLICKED,
-	LAST_SIGNAL
+enum
+{
+    ARROW_CLICKED,
+    LAST_SIGNAL
 };
 
-enum {
-  ARG_0,
-  ARG_EDITING_CANCELED
+enum
+{
+    ARG_0,
+    ARG_EDITING_CANCELED
 };
 
 static GtkEventBoxClass *parent_class;
@@ -59,111 +61,114 @@
 GtkType
 gnc_popup_entry_get_type (void)
 {
-	static GtkType widget_type = 0;
-	
-	if (!widget_type) {
-		static const GTypeInfo widget_info = {
-			sizeof (GncPopupEntryClass),
-			NULL,		/* base_init */
-			NULL,		/* base_finalize */
-			(GClassInitFunc) gnc_popup_entry_class_init,
-			NULL,		/* class_finalize */
-			NULL,		/* class_data */
-			sizeof (GncPopupEntry),
-			0,              /* n_preallocs */
-			(GInstanceInitFunc) gnc_popup_entry_init,
-		};
+    static GtkType widget_type = 0;
 
-		static const GInterfaceInfo cell_editable_info = {
-			(GInterfaceInitFunc) gpw_cell_editable_init,    /* interface_init */
-			NULL,                                           /* interface_finalize */
-			NULL                                            /* interface_data */
-		};
-      
-		widget_type = g_type_register_static (GTK_TYPE_EVENT_BOX,
-						      "GncPopupEntry",
-						      &widget_info,
-						      0);
-		
-		g_type_add_interface_static (widget_type,
-					     GTK_TYPE_CELL_EDITABLE,
-					     &cell_editable_info);
-	}
-	
-	return widget_type;
+    if (!widget_type)
+    {
+        static const GTypeInfo widget_info =
+        {
+            sizeof (GncPopupEntryClass),
+            NULL,		/* base_init */
+            NULL,		/* base_finalize */
+            (GClassInitFunc) gnc_popup_entry_class_init,
+            NULL,		/* class_finalize */
+            NULL,		/* class_data */
+            sizeof (GncPopupEntry),
+            0,              /* n_preallocs */
+            (GInstanceInitFunc) gnc_popup_entry_init,
+        };
+
+        static const GInterfaceInfo cell_editable_info =
+        {
+            (GInterfaceInitFunc) gpw_cell_editable_init,    /* interface_init */
+            NULL,                                           /* interface_finalize */
+            NULL                                            /* interface_data */
+        };
+
+        widget_type = g_type_register_static (GTK_TYPE_EVENT_BOX,
+                                              "GncPopupEntry",
+                                              &widget_info,
+                                              0);
+
+        g_type_add_interface_static (widget_type,
+                                     GTK_TYPE_CELL_EDITABLE,
+                                     &cell_editable_info);
+    }
+
+    return widget_type;
 }
 
 static void
 gnc_popup_entry_init (GncPopupEntry *widget)
 {
-	GtkWidget *arrow;
+    GtkWidget *arrow;
 
-	widget->hbox = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (widget->hbox);
+    widget->hbox = gtk_hbox_new (FALSE, 0);
+    gtk_widget_show (widget->hbox);
 
-	widget->entry = g_object_new (GTK_TYPE_ENTRY, "has_frame", FALSE, NULL);
-	GTK_ENTRY (widget->entry)->is_cell_renderer = TRUE;
-	gtk_widget_show (widget->entry);
+    widget->entry = g_object_new (GTK_TYPE_ENTRY, "has_frame", FALSE, NULL);
+    GTK_ENTRY (widget->entry)->is_cell_renderer = TRUE;
+    gtk_widget_show (widget->entry);
 
-	widget->button = gtk_button_new ();
-	gtk_widget_show (widget->button);
+    widget->button = gtk_button_new ();
+    gtk_widget_show (widget->button);
 
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_widget_show (arrow);
+    arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+    gtk_widget_show (arrow);
 
-	gtk_container_add (GTK_CONTAINER (widget->button), arrow);
+    gtk_container_add (GTK_CONTAINER (widget->button), arrow);
 
-	gtk_box_pack_start (GTK_BOX (widget->hbox), widget->entry, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (widget->hbox), widget->button, FALSE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (widget->hbox), widget->entry, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (widget->hbox), widget->button, FALSE, TRUE, 0);
 
-	gtk_container_add (GTK_CONTAINER (widget), widget->hbox);
+    gtk_container_add (GTK_CONTAINER (widget), widget->hbox);
 
-	GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
-	gtk_widget_add_events (GTK_WIDGET (widget), GDK_KEY_PRESS_MASK);
-	gtk_widget_add_events (GTK_WIDGET (widget), GDK_KEY_RELEASE_MASK);
+    GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+    gtk_widget_add_events (GTK_WIDGET (widget), GDK_KEY_PRESS_MASK);
+    gtk_widget_add_events (GTK_WIDGET (widget), GDK_KEY_RELEASE_MASK);
 }
 
 static void
 gnc_popup_entry_class_init (GncPopupEntryClass *klass)
 {
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-	widget_class->key_press_event = gpw_key_press_event;
+    widget_class->key_press_event = gpw_key_press_event;
 
-        gtk_object_add_arg_type ("GncPopupEntry::editing-canceled", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITING_CANCELED);
-	
-	parent_class = GTK_EVENT_BOX_CLASS (g_type_class_peek_parent (klass));
+    gtk_object_add_arg_type ("GncPopupEntry::editing-canceled", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITING_CANCELED);
 
-	signals[ARROW_CLICKED] = g_signal_new
-		("arrow-clicked",
-		 G_TYPE_FROM_CLASS (klass),
-		 G_SIGNAL_RUN_LAST,
-		 0,
-		 NULL, NULL,
-		 g_cclosure_marshal_VOID__VOID,
-		 G_TYPE_NONE, 0);
+    parent_class = GTK_EVENT_BOX_CLASS (g_type_class_peek_parent (klass));
 
+    signals[ARROW_CLICKED] = g_signal_new
+                             ("arrow-clicked",
+                              G_TYPE_FROM_CLASS (klass),
+                              G_SIGNAL_RUN_LAST,
+                              0,
+                              NULL, NULL,
+                              g_cclosure_marshal_VOID__VOID,
+                              G_TYPE_NONE, 0);
+
 }
 
 static void
 gpw_arrow_clicked (GtkWidget *button, GncPopupEntry *widget)
 {
-	g_signal_emit (widget, signals[ARROW_CLICKED], 0);
+    g_signal_emit (widget, signals[ARROW_CLICKED], 0);
 }
-	
+
 /* GtkCellEditable method implementations
  */
 static void
 gtk_cell_editable_entry_activated (GtkEntry *entry, GncPopupEntry *widget)
 {
-	gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (widget));
-	gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (widget));
+    gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (widget));
+    gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (widget));
 }
 
 static gboolean
 gtk_cell_editable_key_press_event (GtkEntry      *entry,
-				   GdkEventKey   *key_event,
-				   GncPopupEntry *widget)
+                                   GdkEventKey   *key_event,
+                                   GncPopupEntry *widget)
 {
     const char *date_string;
     gint year = 0, month = 0, day = 0;
@@ -171,12 +176,12 @@
 
     if (key_event->keyval == GDK_Escape)
     {
-	widget->editing_canceled = TRUE;
-		
-	gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (widget));
-	gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (widget));
+        widget->editing_canceled = TRUE;
 
-	return TRUE;
+        gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (widget));
+        gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (widget));
+
+        return TRUE;
     }
 
     date_string = gtk_entry_get_text (entry);
@@ -201,117 +206,118 @@
 
 static gboolean
 gpw_key_press_event (GtkWidget   *box,
-		     GdkEventKey *key_event)
+                     GdkEventKey *key_event)
 {
-	GncPopupEntry *widget = GNC_POPUP_ENTRY (box);
-	GdkEvent       tmp_event;
+    GncPopupEntry *widget = GNC_POPUP_ENTRY (box);
+    GdkEvent       tmp_event;
 
-	gtk_widget_grab_focus (widget->entry);
+    gtk_widget_grab_focus (widget->entry);
 
-	if (key_event->keyval == GDK_Escape) {
-		widget->editing_canceled = TRUE;
+    if (key_event->keyval == GDK_Escape)
+    {
+        widget->editing_canceled = TRUE;
 
-		gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (widget));
-		gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (widget));
-		
-		return TRUE;
-	}
+        gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (widget));
+        gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (widget));
 
-        if (key_event->keyval == GDK_Left)
-        {
-            gtk_editable_set_position (GTK_EDITABLE (widget->entry), 0);
-            return TRUE;
-        }
+        return TRUE;
+    }
 
-        if (key_event->keyval == GDK_Right)
-        {
-            gtk_editable_set_position (GTK_EDITABLE (widget->entry), -1);
-            return TRUE;
-        }
+    if (key_event->keyval == GDK_Left)
+    {
+        gtk_editable_set_position (GTK_EDITABLE (widget->entry), 0);
+        return TRUE;
+    }
 
-	/* Hackish :/ Synthesize a key press event for the entry. */
-	memcpy (&tmp_event, key_event, sizeof (GdkEventKey));
+    if (key_event->keyval == GDK_Right)
+    {
+        gtk_editable_set_position (GTK_EDITABLE (widget->entry), -1);
+        return TRUE;
+    }
 
-	tmp_event.key.window = widget->entry->window;
-	tmp_event.key.send_event = TRUE;
-	
-	gtk_widget_event (widget->entry, &tmp_event);
+    /* Hackish :/ Synthesize a key press event for the entry. */
+    memcpy (&tmp_event, key_event, sizeof (GdkEventKey));
 
-	return GTK_WIDGET_CLASS (parent_class)->key_press_event (GTK_WIDGET (widget), 
-								 key_event);
+    tmp_event.key.window = widget->entry->window;
+    tmp_event.key.send_event = TRUE;
+
+    gtk_widget_event (widget->entry, &tmp_event);
+
+    return GTK_WIDGET_CLASS (parent_class)->key_press_event (GTK_WIDGET (widget),
+            key_event);
 }
 
 static void
 gpw_start_editing (GtkCellEditable *cell_editable,
-		   GdkEvent        *event)
+                   GdkEvent        *event)
 {
-	GncPopupEntry *widget = GNC_POPUP_ENTRY (cell_editable);
+    GncPopupEntry *widget = GNC_POPUP_ENTRY (cell_editable);
 
-	gtk_editable_select_region (GTK_EDITABLE (widget->entry), 0, -1);
+    gtk_editable_select_region (GTK_EDITABLE (widget->entry), 0, -1);
 
-	g_signal_connect (G_OBJECT (widget->entry),
-			  "activate",
-			  G_CALLBACK (gtk_cell_editable_entry_activated),
-			  widget);
-	g_signal_connect (G_OBJECT (widget->entry),
-			  "key_press_event",
-			  G_CALLBACK (gtk_cell_editable_key_press_event),
-			  widget);
-	g_signal_connect (G_OBJECT (widget->button),
-			  "clicked",
-			  (GCallback) gpw_arrow_clicked,
-			  widget);
+    g_signal_connect (G_OBJECT (widget->entry),
+                      "activate",
+                      G_CALLBACK (gtk_cell_editable_entry_activated),
+                      widget);
+    g_signal_connect (G_OBJECT (widget->entry),
+                      "key_press_event",
+                      G_CALLBACK (gtk_cell_editable_key_press_event),
+                      widget);
+    g_signal_connect (G_OBJECT (widget->button),
+                      "clicked",
+                      (GCallback) gpw_arrow_clicked,
+                      widget);
 }
 
 static void
 gpw_cell_editable_init (GtkCellEditableIface *iface)
 {
-	iface->start_editing = gpw_start_editing;
+    iface->start_editing = gpw_start_editing;
 }
 
 void
 gnc_popup_entry_set_text (GncPopupEntry *popup, const gchar *text)
 {
-	g_return_if_fail (GNC_IS_POPUP_ENTRY (popup));
+    g_return_if_fail (GNC_IS_POPUP_ENTRY (popup));
 
-	gtk_entry_set_text (GTK_ENTRY (popup->entry), text ? text : "");
+    gtk_entry_set_text (GTK_ENTRY (popup->entry), text ? text : "");
 }
 
 const gchar *
 gnc_popup_entry_get_text (GncPopupEntry *popup)
 {
-	g_return_val_if_fail (GNC_IS_POPUP_ENTRY (popup), NULL);
+    g_return_val_if_fail (GNC_IS_POPUP_ENTRY (popup), NULL);
 
-	return gtk_entry_get_text (GTK_ENTRY (popup->entry));
+    return gtk_entry_get_text (GTK_ENTRY (popup->entry));
 }
 
 gint
 gnc_popup_get_button_width (void)
 {
-	GtkWidget *window, *button, *arrow;
-	gint       width;
+    GtkWidget *window, *button, *arrow;
+    gint       width;
 
-	GtkRequisition req;
-	
-	window = gtk_window_new (GTK_WINDOW_POPUP);
-	
-	button = gtk_button_new ();
-	gtk_widget_show (button);
-	gtk_container_add (GTK_CONTAINER (window), button);
+    GtkRequisition req;
 
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_widget_show (arrow);
-	gtk_container_add (GTK_CONTAINER (button), arrow);
+    window = gtk_window_new (GTK_WINDOW_POPUP);
 
-	gtk_window_move (GTK_WINDOW (window), -500, -500);
-	gtk_widget_show (window);
+    button = gtk_button_new ();
+    gtk_widget_show (button);
+    gtk_container_add (GTK_CONTAINER (window), button);
 
-	gtk_widget_size_request (window, &req);
-	
-	width = req.width;
+    arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+    gtk_widget_show (arrow);
+    gtk_container_add (GTK_CONTAINER (button), arrow);
 
-	gtk_widget_destroy (window);
+    gtk_window_move (GTK_WINDOW (window), -500, -500);
+    gtk_widget_show (window);
 
-	return width;
+    gtk_widget_size_request (window, &req);
+
+    width = req.width;
+
+    gtk_widget_destroy (window);
+
+    return width;
 }
 

Modified: gnucash/trunk/src/gnome-utils/gnc-cell-renderer-popup-entry.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-cell-renderer-popup-entry.h	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-cell-renderer-popup-entry.h	2013-10-31 22:22:53 UTC (rev 23358)
@@ -45,18 +45,18 @@
 
 struct _GncPopupEntry
 {
-	GtkEventBox  parent;
+    GtkEventBox  parent;
 
-	GtkWidget   *hbox;
-	GtkWidget   *button;
-	GtkWidget   *entry;
+    GtkWidget   *hbox;
+    GtkWidget   *button;
+    GtkWidget   *entry;
 
-	gboolean     editing_canceled;
+    gboolean     editing_canceled;
 };
 
 struct _GncPopupEntryClass
 {
-	GtkEventBoxClass parent_class;
+    GtkEventBoxClass parent_class;
 };
 
 GtkType      gnc_popup_entry_get_type   (void) G_GNUC_CONST;
@@ -64,7 +64,7 @@
 GtkWidget   *gnc_popup_entry_new        (void);
 
 void         gnc_popup_entry_set_text   (GncPopupEntry *popup,
-					const gchar  *text);
+        const gchar  *text);
 
 const gchar *gnc_popup_entry_get_text   (GncPopupEntry *popup);
 

Modified: gnucash/trunk/src/gnome-utils/gnc-combott.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-combott.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-combott.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -32,17 +32,19 @@
 #include <strings.h>
 #include <string.h>
 
-enum {
-  CHANGED,
-  LAST_SIGNAL
+enum
+{
+    CHANGED,
+    LAST_SIGNAL
 };
 
-enum {
-	PROP_0,
-        PROP_MODEL,
-        PROP_ACTIVE,
-        PROP_TEXT_COL,
-        PROP_TIP_COL,
+enum
+{
+    PROP_0,
+    PROP_MODEL,
+    PROP_ACTIVE,
+    PROP_TEXT_COL,
+    PROP_TIP_COL,
 };
 
 #define GNC_COMBOTT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_COMBOTT, GncCombottPrivate))
@@ -69,7 +71,7 @@
     gint           width;
     gint           height;
 
-}GncCombottPrivate;
+} GncCombottPrivate;
 
 /** Declarations *********************************************************/
 static void gctt_init (GncCombott *combott);
@@ -77,14 +79,14 @@
 static void gctt_class_init (GncCombottClass *class);
 
 static void gctt_set_property (GObject *object,
-			       guint param_id,
-			       const GValue *value,
-			       GParamSpec *pspec);
+                               guint param_id,
+                               const GValue *value,
+                               GParamSpec *pspec);
 
 static void gctt_get_property (GObject *object,
-			       guint param_id,
-			       GValue *value,
-			       GParamSpec *pspec);
+                               guint param_id,
+                               GValue *value,
+                               GParamSpec *pspec);
 
 static void gctt_finalize (GObject *object);
 
@@ -100,7 +102,7 @@
 static void gctt_rebuild_menu (GncCombott *combott, GtkTreeModel *model);
 
 static gboolean which_tooltip_cb (GtkWidget  *widget, gint x, gint y,
-				 gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data);
+                                  gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data);
 static gboolean button_press_cb (GtkWidget *widget, GdkEvent *event, gpointer *user_data );
 static void button_getsize_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer *user_data);
 static void menu_getsize_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer *user_data);
@@ -117,22 +119,24 @@
 {
     static GType combott_type = 0;
 
-    if (!combott_type) {
-	static const GTypeInfo combott_info = {
-		sizeof (GncCombottClass),
-		NULL,		/* base_init */
-		NULL,		/* base_finalize */
-		(GClassInitFunc) gctt_class_init,
-		NULL,		/* class_finalize */
-		NULL,		/* class_data */
-		sizeof (GncCombott),
-		0,              /* n_preallocs */
-		(GInstanceInitFunc) gctt_init,
-	};
+    if (!combott_type)
+    {
+        static const GTypeInfo combott_info =
+        {
+            sizeof (GncCombottClass),
+            NULL,		/* base_init */
+            NULL,		/* base_finalize */
+            (GClassInitFunc) gctt_class_init,
+            NULL,		/* class_finalize */
+            NULL,		/* class_data */
+            sizeof (GncCombott),
+            0,              /* n_preallocs */
+            (GInstanceInitFunc) gctt_init,
+        };
 
-	combott_type = g_type_register_static (GTK_TYPE_HBOX,
-						 "GncCombott",
-						 &combott_info, 0);
+        combott_type = g_type_register_static (GTK_TYPE_HBOX,
+                                               "GncCombott",
+                                               &combott_info, 0);
     }
     return combott_type;
 }
@@ -153,44 +157,44 @@
     class->changed = gctt_changed;
 
     combott_signals[CHANGED] =
-    g_signal_new ("changed",
-                  G_OBJECT_CLASS_TYPE (class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (GncCombottClass, changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+        g_signal_new ("changed",
+                      G_OBJECT_CLASS_TYPE (class),
+                      G_SIGNAL_RUN_LAST,
+                      G_STRUCT_OFFSET (GncCombottClass, changed),
+                      NULL, NULL,
+                      g_cclosure_marshal_VOID__VOID,
+                      G_TYPE_NONE, 0);
 
     g_object_class_install_property (
-	 	 gobject_class,
-                 PROP_MODEL,
-                 g_param_spec_object ("model",
-				       "Combott model",
-				       "The model for the combo tooltip",
-				       GTK_TYPE_TREE_MODEL,
-				       G_PARAM_READWRITE));
+        gobject_class,
+        PROP_MODEL,
+        g_param_spec_object ("model",
+                             "Combott model",
+                             "The model for the combo tooltip",
+                             GTK_TYPE_TREE_MODEL,
+                             G_PARAM_READWRITE));
 
     g_object_class_install_property (
-	 	 gobject_class,
-                 PROP_TEXT_COL,
-                 g_param_spec_int ("text-col",
-				       "text column",
-				       "Column for the text",
-                                       0,
-                                       G_MAXINT,
-                                       0,
-                                       G_PARAM_READWRITE));
+        gobject_class,
+        PROP_TEXT_COL,
+        g_param_spec_int ("text-col",
+                          "text column",
+                          "Column for the text",
+                          0,
+                          G_MAXINT,
+                          0,
+                          G_PARAM_READWRITE));
 
     g_object_class_install_property (
-	 	 gobject_class,
-                 PROP_TIP_COL,
-                 g_param_spec_int ("tip-col",
-				       "tip column",
-				       "Column for the tip",
-                                       0,
-                                       G_MAXINT,
-                                       1,
-                                       G_PARAM_READWRITE));
+        gobject_class,
+        PROP_TIP_COL,
+        g_param_spec_int ("tip-col",
+                          "tip column",
+                          "Column for the tip",
+                          0,
+                          G_MAXINT,
+                          1,
+                          G_PARAM_READWRITE));
 
     g_type_class_add_private(class, sizeof(GncCombottPrivate));
 }
@@ -230,15 +234,15 @@
     gtk_container_add(GTK_CONTAINER(combott), GTK_WIDGET(button));
 
     g_signal_connect (button, "event",
-	                 G_CALLBACK (button_press_cb), combott);
+                      G_CALLBACK (button_press_cb), combott);
 
     gtk_widget_set_has_tooltip (GTK_WIDGET(combott), TRUE);
 
     g_signal_connect(G_OBJECT(combott), "query-tooltip",
-                         G_CALLBACK(which_tooltip_cb), combott);
+                     G_CALLBACK(which_tooltip_cb), combott);
 
     g_signal_connect(G_OBJECT(combott), "size-allocate",
-			 G_CALLBACK(button_getsize_cb), combott);
+                     G_CALLBACK(button_getsize_cb), combott);
 
     gtk_widget_show(GTK_WIDGET(priv->button));
 }
@@ -246,34 +250,35 @@
 
 static void
 gctt_set_property (GObject      *object,
-		   guint         param_id,
-		   const GValue *value,
-		   GParamSpec   *pspec)
+                   guint         param_id,
+                   const GValue *value,
+                   GParamSpec   *pspec)
 {
     GncCombott *combott = GNC_COMBOTT (object);
     GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
-	
-    switch (param_id) {
+
+    switch (param_id)
+    {
     case PROP_MODEL:
-         gctt_set_model (combott, g_value_get_object (value));
-	 break;
+        gctt_set_model (combott, g_value_get_object (value));
+        break;
 
     case PROP_ACTIVE:
-         gnc_combott_set_active (combott, g_value_get_int (value));
-         break;
+        gnc_combott_set_active (combott, g_value_get_int (value));
+        break;
 
     case PROP_TEXT_COL:
-         priv->text_col = g_value_get_int (value);
-         break;
+        priv->text_col = g_value_get_int (value);
+        break;
 
     case PROP_TIP_COL:
-         priv->tip_col = g_value_get_int (value);
-         gctt_refresh_menu(combott, priv->model);
-         break;
+        priv->tip_col = g_value_get_int (value);
+        gctt_refresh_menu(combott, priv->model);
+        break;
 
     default:
-	 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-	 break;
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+        break;
     }
 }
 
@@ -285,33 +290,34 @@
  */
 static void
 gctt_get_property (GObject    *object,
-		   guint       param_id,
-		   GValue     *value,
-		   GParamSpec *pspec)
+                   guint       param_id,
+                   GValue     *value,
+                   GParamSpec *pspec)
 {
     GncCombott *combott = GNC_COMBOTT (object);
     GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
-	
-    switch (param_id) {
+
+    switch (param_id)
+    {
     case PROP_MODEL:
-	 g_value_take_object (value, priv->model);
-	 break;
+        g_value_take_object (value, priv->model);
+        break;
 
     case PROP_ACTIVE:
-         g_value_set_int (value, gnc_combott_get_active (combott));
-         break;
+        g_value_set_int (value, gnc_combott_get_active (combott));
+        break;
 
     case PROP_TEXT_COL:
-         g_value_set_int (value, priv->text_col);
-         break;
+        g_value_set_int (value, priv->text_col);
+        break;
 
     case PROP_TIP_COL:
-         g_value_set_int (value, priv->tip_col);
-         break;
+        g_value_set_int (value, priv->tip_col);
+        break;
 
     default:
-	 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-	 break;
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+        break;
     }
 }
 
@@ -387,9 +393,9 @@
         gchar *str_data;
         gchar *tip_data;
         gtk_tree_model_get (model, &iter,
-                          priv->text_col, &str_data,
-                          priv->tip_col, &tip_data,
-                         -1);
+                            priv->text_col, &str_data,
+                            priv->tip_col, &tip_data,
+                            -1);
 
         /* Create a new menu-item with a name... */
         menu_items = gtk_menu_item_new_with_label (str_data);
@@ -406,8 +412,8 @@
         /* ...and add it to the menu. */
         gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menu_items);
         g_signal_connect (menu_items, "activate",
-		                      G_CALLBACK (menuitem_response_cb),
-                                      combott);
+                          G_CALLBACK (menuitem_response_cb),
+                          combott);
 
         /* Show the widget */
         gtk_widget_show (menu_items);
@@ -416,7 +422,7 @@
         g_free (tip_data);
         items++;
         valid = gtk_tree_model_iter_next (model, &iter);
-        }
+    }
 
     g_signal_connect(G_OBJECT(priv->menu), "size-allocate", G_CALLBACK(menu_getsize_cb), combott);
 
@@ -445,25 +451,25 @@
 static void
 gctt_changed(GncCombott *combott)
 {
-/*
-g_print("Changed Signal\n");
-*/
+    /*
+    g_print("Changed Signal\n");
+    */
 }
 
 
 static void
 gctt_combott_menu_position (GtkMenu  *menu,
-			   gint     *x,
-			   gint     *y,
-			   gint     *push_in,
-			   gpointer  user_data)
+                            gint     *x,
+                            gint     *y,
+                            gint     *push_in,
+                            gpointer  user_data)
 {
     GncCombott *combott = GNC_COMBOTT (user_data);
     GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
     gint sx, sy;
     GtkWidget *child;
     GtkRequisition req;
- 
+
     child = GTK_BIN (priv->button)->child;
 
     sx = sy = 0;
@@ -490,7 +496,7 @@
     else
         *y = sy - ((req.height / priv->num_items) * (priv->active - 1));
 
-   *push_in = FALSE;
+    *push_in = FALSE;
 }
 
 
@@ -519,7 +525,7 @@
 
 
 static gboolean
-which_tooltip_cb (GtkWidget  *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data) 
+which_tooltip_cb (GtkWidget  *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data)
 {
     gchar *text = "";
 
@@ -542,7 +548,7 @@
             return FALSE;
         }
     }
-   return FALSE;
+    return FALSE;
 }
 
 
@@ -554,13 +560,14 @@
 
     if(priv->model != NULL)
     {
-        if (event->type == GDK_BUTTON_PRESS) {
+        if (event->type == GDK_BUTTON_PRESS)
+        {
             GdkEventButton *bevent = (GdkEventButton *) event;
 
             gtk_menu_popup (GTK_MENU (priv->menu),
-		  NULL, NULL,
-		  gctt_combott_menu_position, combott,
-		  bevent->button, bevent->time);
+                            NULL, NULL,
+                            gctt_combott_menu_position, combott,
+                            bevent->button, bevent->time);
 
             /* Tell calling code that we have handled this event; the buck
              * stops here. */
@@ -598,9 +605,9 @@
         gchar *str_data;
         gchar *tip_data;
         gtk_tree_model_get (priv->model, &iter,
-                          priv->text_col, &str_data,
-                          priv->tip_col, &tip_data,
-                         -1);
+                            priv->text_col, &str_data,
+                            priv->tip_col, &tip_data,
+                            -1);
         if(!g_strcmp0(str_data, label_text))
         {
             active_now = active;
@@ -688,9 +695,9 @@
                     /* Make sure you terminate calls to gtk_tree_model_get()
                      * with a '-1' value */
                     gtk_tree_model_get (priv->model, &iter,
-                                  priv->text_col, &str_data,
-                                  priv->tip_col, &tip_data,
-                                 -1);
+                                        priv->text_col, &str_data,
+                                        priv->tip_col, &tip_data,
+                                        -1);
 
                     if(index + 1 == active)
                     {

Modified: gnucash/trunk/src/gnome-utils/gnc-currency-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-currency-edit.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-currency-edit.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -75,10 +75,10 @@
 static void gnc_currency_edit_class_init   (GNCCurrencyEditClass *class);
 static void gnc_currency_edit_finalize     (GObject *object);
 static void gnc_currency_edit_mnemonic_changed (GObject    *gobject,
-                                                GParamSpec *pspec,
-                                                gpointer    user_data);
+        GParamSpec *pspec,
+        gpointer    user_data);
 static void gnc_currency_edit_active_changed (GtkComboBox *gobject,
-                                              gpointer     user_data);
+        gpointer     user_data);
 
 static GtkComboBoxClass *parent_class;
 
@@ -127,11 +127,11 @@
 
 enum
 {
-  PROP_0,
+    PROP_0,
 
-  PROP_GCE_MNEMONIC,
+    PROP_GCE_MNEMONIC,
 
-  N_PROPERTIES
+    N_PROPERTIES
 };
 
 static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
@@ -147,16 +147,16 @@
 
     switch (property_id)
     {
-        case PROP_GCE_MNEMONIC:
-            g_free (priv->mnemonic);
-              priv->mnemonic = g_value_dup_string (value);
-              DEBUG ("mnemonic: %s\n", priv->mnemonic);
-              break;
+    case PROP_GCE_MNEMONIC:
+        g_free (priv->mnemonic);
+        priv->mnemonic = g_value_dup_string (value);
+        DEBUG ("mnemonic: %s\n", priv->mnemonic);
+        break;
 
-        default:
-            /* We don't have any other property... */
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-            break;
+    default:
+        /* We don't have any other property... */
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+        break;
     }
 }
 
@@ -171,14 +171,14 @@
 
     switch (property_id)
     {
-        case PROP_GCE_MNEMONIC:
-            g_value_set_string (value, priv->mnemonic);
-            break;
+    case PROP_GCE_MNEMONIC:
+        g_value_set_string (value, priv->mnemonic);
+        break;
 
-        default:
-            /* We don't have any other property... */
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-            break;
+    default:
+        /* We don't have any other property... */
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+        break;
     }
 }
 
@@ -204,11 +204,11 @@
     gobject_class->finalize     = gnc_currency_edit_finalize;
 
     obj_properties[PROP_GCE_MNEMONIC] =
-            g_param_spec_string ("mnemonic",
-                                 "Active currency's mnemonic",
-                                 "Active currency's mnemonic",
-                                 "USD" /* default value */,
-                                 G_PARAM_READWRITE);
+        g_param_spec_string ("mnemonic",
+                             "Active currency's mnemonic",
+                             "Active currency's mnemonic",
+                             "USD" /* default value */,
+                             G_PARAM_READWRITE);
 
     g_object_class_install_properties (gobject_class,
                                        N_PROPERTIES,
@@ -274,8 +274,8 @@
     GNCCurrencyEditPrivate *priv = GET_PRIVATE (self);
 
     gnc_commodity *currency = gnc_commodity_table_lookup (gnc_get_current_commodities (),
-                                                          GNC_COMMODITY_NS_CURRENCY,
-                                                          priv->mnemonic);
+                              GNC_COMMODITY_NS_CURRENCY,
+                              priv->mnemonic);
 
     /* If there isn't any such commodity, get the default */
     if (!currency)
@@ -294,7 +294,7 @@
 
 
 static void gnc_currency_edit_active_changed (GtkComboBox *gobject,
-                                              gpointer     user_data)
+        gpointer     user_data)
 {
     GNCCurrencyEdit *self = GNC_CURRENCY_EDIT (gobject);
     GNCCurrencyEditPrivate *priv = GET_PRIVATE (self);

Modified: gnucash/trunk/src/gnome-utils/gnc-date-delta.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-delta.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-date-delta.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -213,13 +213,13 @@
 fill_units_combo(GNCDateDelta *gdd)
 {
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->units_combo),
-                              _("Days"));
+                                   _("Days"));
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->units_combo),
-                              _("Weeks"));
+                                   _("Weeks"));
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->units_combo),
-                              _("Months"));
+                                   _("Months"));
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->units_combo),
-                              _("Years"));
+                                   _("Years"));
 
     g_signal_connect (gdd->units_combo, "changed",
                       G_CALLBACK (set_units), gdd);
@@ -243,9 +243,9 @@
 fill_polarity_combo(GNCDateDelta *gdd)
 {
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->polarity_combo),
-                              _("Ago"));
+                                   _("Ago"));
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gdd->polarity_combo),
-                              _("From Now"));
+                                   _("From Now"));
 
     g_signal_connect (gdd->polarity_combo, "changed",
                       G_CALLBACK(set_polarity), gdd);

Modified: gnucash/trunk/src/gnome-utils/gnc-date-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-edit.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-date-edit.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -276,7 +276,7 @@
 
     /* This code is pretty much just copied from gtk_date_edit_get_date */
     date_was_valid = qof_scan_date (gtk_entry_get_text (GTK_ENTRY (gde->date_entry)),
-                   &mtm.tm_mday, &mtm.tm_mon, &mtm.tm_year);
+                                    &mtm.tm_mday, &mtm.tm_mon, &mtm.tm_year);
     if (!date_was_valid)
     {
         /* No valid date. Hacky workaround: Instead of crashing we randomly choose today's date. */
@@ -885,7 +885,7 @@
     gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( gde->time_combo ), cell, "text", 0, NULL );
 
     g_signal_connect (G_OBJECT (gde->time_combo), "changed",
-                              G_CALLBACK  (set_time), gde);
+                      G_CALLBACK  (set_time), gde);
 
     gtk_box_pack_start (GTK_BOX (gde), gde->time_combo, FALSE, FALSE, 0);
 
@@ -1031,7 +1031,7 @@
     g_assert(GNC_IS_DATE_EDIT(gde));
 
     date_was_valid = qof_scan_date (gtk_entry_get_text (GTK_ENTRY (gde->date_entry)),
-                   &tm.tm_mday, &tm.tm_mon, &tm.tm_year);
+                                    &tm.tm_mday, &tm.tm_mon, &tm.tm_year);
 
     if (!date_was_valid)
     {

Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -1140,7 +1140,7 @@
         return FALSE; /* remove timer */
     }
 
-   /* Stop count down if user closed the dialog since the last time we were called */
+    /* Stop count down if user closed the dialog since the last time we were called */
     if (!GTK_IS_DIALOG (dialog))
         return FALSE; /* remove timer */
 
@@ -1515,7 +1515,7 @@
     }
     /* Update the menus based upon whether this is an "immutable" page. */
     immutable = page &&
-        g_object_get_data (G_OBJECT (page), PLUGIN_PAGE_IMMUTABLE);
+                g_object_get_data (G_OBJECT (page), PLUGIN_PAGE_IMMUTABLE);
     gnc_plugin_update_actions(priv->action_group,
                               immutable_page_actions,
                               "sensitive", !immutable);
@@ -1597,7 +1597,9 @@
         GtkWidget *statusbar = gnc_main_window_get_statusbar(GNC_WINDOW(mainwindow));
         gtk_statusbar_remove(GTK_STATUSBAR(statusbar), 0, gnc_statusbar_notification_messageid);
         gnc_statusbar_notification_messageid = 0;
-    } else {
+    }
+    else
+    {
         g_warning("oops, no GncMainWindow obtained\n");
     }
     return FALSE; // should not be called again
@@ -1644,9 +1646,9 @@
                     that has the a.m. or p.m. string in its locale, second
                     string is for locales that do not have that string. */
                     gchar *time_string =
-                            g_date_time_format (gdt, (strlen(dummy_strftime_has_ampm) > 0)
-                                                ? _("Last modified on %a, %b %e, %Y at %I:%M%P")
-                                                : _("Last modified on %a, %b %e, %Y at %H:%M"));
+                        g_date_time_format (gdt, (strlen(dummy_strftime_has_ampm) > 0)
+                                            ? _("Last modified on %a, %b %e, %Y at %I:%M%P")
+                                            : _("Last modified on %a, %b %e, %Y at %H:%M"));
 
                     g_date_time_unref (gdt);
 
@@ -1682,7 +1684,7 @@
     GList *iter;
     GtkWidget *widget = NULL;
     for (iter = active_windows; iter && !(widget && GNC_IS_MAIN_WINDOW(widget));
-         iter = g_list_next(iter))
+            iter = g_list_next(iter))
     {
         widget = iter->data;
     }
@@ -1704,7 +1706,9 @@
         // notification again after 10 seconds
         g_timeout_add(10 * 1000, statusbar_notification_off, NULL); // maybe not needed anyway?
 #endif
-    } else {
+    }
+    else
+    {
         g_warning("uh oh, no GNC_IS_MAIN_WINDOW\n");
     }
 }
@@ -3936,7 +3940,7 @@
 
 static void
 gnc_book_options_dialog_apply_cb(GNCOptionWin * optionwin,
-                            gpointer user_data)
+                                 gpointer user_data)
 {
     GNCOptionDB * options = user_data;
     kvp_frame *slots = qof_book_get_slots (gnc_get_current_book ());
@@ -3957,7 +3961,7 @@
 
 static void
 gnc_book_options_dialog_close_cb(GNCOptionWin * optionwin,
-                            gpointer user_data)
+                                 gpointer user_data)
 {
     GNCOptionDB * options = user_data;
 
@@ -3977,7 +3981,7 @@
     gnc_option_db_clean (options);
 
     optionwin = gnc_options_dialog_new_modal (modal,
-                                                (title ? title : _( "Book Options")));
+                (title ? title : _( "Book Options")));
     gnc_options_dialog_build_contents (optionwin, options);
 
     gnc_options_dialog_set_book_options_help_cb (optionwin);

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -80,10 +80,10 @@
                                 gpointer           view);
 
 static void acc_color_data_func (GtkTreeViewColumn *col,
-                                GtkCellRenderer   *renderer,
-                                GtkTreeModel      *model,
-                                GtkTreeIter       *iter,
-                                gpointer           view);
+                                 GtkCellRenderer   *renderer,
+                                 GtkTreeModel      *model,
+                                 GtkTreeIter       *iter,
+                                 gpointer           view);
 
 static void gnc_tree_view_account_color_update (gpointer gsettings, gchar *key, gpointer user_data);
 
@@ -591,10 +591,10 @@
  */
 static void
 acc_color_data_func (GtkTreeViewColumn *col,
-                    GtkCellRenderer   *renderer,
-                    GtkTreeModel      *model,
-                    GtkTreeIter       *iter,
-                    gpointer           view)
+                     GtkCellRenderer   *renderer,
+                     GtkTreeModel      *model,
+                     GtkTreeIter       *iter,
+                     gpointer           view)
 {
     GncTreeViewAccountPrivate *priv;
     gchar                     *acc_color = NULL, *acc_cond_color = NULL;
@@ -715,11 +715,11 @@
     sample_commodity = gnc_commodity_get_fullname(gnc_default_currency());
 
     priv->name_column
-    = gnc_tree_view_add_text_column(view, _("Account Name"), "name",
-                                    GNC_STOCK_ACCOUNT, "Expenses:Entertainment",
-                                    GNC_TREE_MODEL_ACCOUNT_COL_NAME,
-                                    GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                    sort_by_string);
+        = gnc_tree_view_add_text_column(view, _("Account Name"), "name",
+                                        GNC_STOCK_ACCOUNT, "Expenses:Entertainment",
+                                        GNC_TREE_MODEL_ACCOUNT_COL_NAME,
+                                        GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                        sort_by_string);
 
     renderer = gnc_tree_view_column_get_renderer(priv->name_column);
 
@@ -740,17 +740,17 @@
                                   GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                   sort_by_string);
     priv->code_column
-    = gnc_tree_view_add_text_column(view, _("Account Code"), "account-code", NULL,
-                                    "1-123-1234",
-                                    GNC_TREE_MODEL_ACCOUNT_COL_CODE,
-                                    GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                    sort_by_code);
+        = gnc_tree_view_add_text_column(view, _("Account Code"), "account-code", NULL,
+                                        "1-123-1234",
+                                        GNC_TREE_MODEL_ACCOUNT_COL_CODE,
+                                        GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                        sort_by_code);
     priv->desc_column
-    = gnc_tree_view_add_text_column(view, _("Description"), "description", NULL,
-                                    "Sample account description.",
-                                    GNC_TREE_MODEL_ACCOUNT_COL_DESCRIPTION,
-                                    GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                    sort_by_string);
+        = gnc_tree_view_add_text_column(view, _("Description"), "description", NULL,
+                                        "Sample account description.",
+                                        GNC_TREE_MODEL_ACCOUNT_COL_DESCRIPTION,
+                                        GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                        sort_by_string);
 
     gnc_tree_view_add_numeric_column(view, _("Last Num"), "lastnum", "12345",
                                      GNC_TREE_MODEL_ACCOUNT_COL_LASTNUM,
@@ -765,12 +765,12 @@
                                      GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                      sort_by_present_value);
     priv->present_report_column
-    = gnc_tree_view_add_numeric_column(view, _("Present (Report)"), "present_report",
-                                       SAMPLE_ACCOUNT_VALUE,
-                                       GNC_TREE_MODEL_ACCOUNT_COL_PRESENT_REPORT,
-                                       GNC_TREE_MODEL_ACCOUNT_COL_COLOR_PRESENT,
-                                       GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                       sort_by_present_value);
+        = gnc_tree_view_add_numeric_column(view, _("Present (Report)"), "present_report",
+                                           SAMPLE_ACCOUNT_VALUE,
+                                           GNC_TREE_MODEL_ACCOUNT_COL_PRESENT_REPORT,
+                                           GNC_TREE_MODEL_ACCOUNT_COL_COLOR_PRESENT,
+                                           GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                           sort_by_present_value);
 
     gnc_tree_view_add_numeric_column(view, _("Balance"), "balance",
                                      SAMPLE_ACCOUNT_VALUE,
@@ -779,12 +779,12 @@
                                      GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                      sort_by_balance_value);
     priv->balance_report_column
-    = gnc_tree_view_add_numeric_column(view, _("Balance (Report)"), "balance_report",
-                                       SAMPLE_ACCOUNT_VALUE,
-                                       GNC_TREE_MODEL_ACCOUNT_COL_BALANCE_REPORT,
-                                       GNC_TREE_MODEL_ACCOUNT_COL_COLOR_BALANCE,
-                                       GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                       sort_by_balance_value);
+        = gnc_tree_view_add_numeric_column(view, _("Balance (Report)"), "balance_report",
+                                           SAMPLE_ACCOUNT_VALUE,
+                                           GNC_TREE_MODEL_ACCOUNT_COL_BALANCE_REPORT,
+                                           GNC_TREE_MODEL_ACCOUNT_COL_COLOR_BALANCE,
+                                           GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                           sort_by_balance_value);
 
     gnc_tree_view_add_numeric_column(view, _("Balance (Period)"), "balance-period",
                                      SAMPLE_ACCOUNT_VALUE,
@@ -800,12 +800,12 @@
                                      GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                      sort_by_cleared_value);
     priv->cleared_report_column
-    = gnc_tree_view_add_numeric_column(view, _("Cleared (Report)"), "cleared_report",
-                                       SAMPLE_ACCOUNT_VALUE,
-                                       GNC_TREE_MODEL_ACCOUNT_COL_CLEARED_REPORT,
-                                       GNC_TREE_MODEL_ACCOUNT_COL_COLOR_CLEARED,
-                                       GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                       sort_by_cleared_value);
+        = gnc_tree_view_add_numeric_column(view, _("Cleared (Report)"), "cleared_report",
+                                           SAMPLE_ACCOUNT_VALUE,
+                                           GNC_TREE_MODEL_ACCOUNT_COL_CLEARED_REPORT,
+                                           GNC_TREE_MODEL_ACCOUNT_COL_COLOR_CLEARED,
+                                           GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                           sort_by_cleared_value);
 
     gnc_tree_view_add_numeric_column(view, _("Reconciled"), "reconciled",
                                      SAMPLE_ACCOUNT_VALUE,
@@ -814,12 +814,12 @@
                                      GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                      sort_by_reconciled_value);
     priv->reconciled_report_column
-    = gnc_tree_view_add_numeric_column(view, _("Reconciled (Report)"), "reconciled_report",
-                                       SAMPLE_ACCOUNT_VALUE,
-                                       GNC_TREE_MODEL_ACCOUNT_COL_RECONCILED_REPORT,
-                                       GNC_TREE_MODEL_ACCOUNT_COL_COLOR_RECONCILED,
-                                       GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                       sort_by_reconciled_value);
+        = gnc_tree_view_add_numeric_column(view, _("Reconciled (Report)"), "reconciled_report",
+                                           SAMPLE_ACCOUNT_VALUE,
+                                           GNC_TREE_MODEL_ACCOUNT_COL_RECONCILED_REPORT,
+                                           GNC_TREE_MODEL_ACCOUNT_COL_COLOR_RECONCILED,
+                                           GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                           sort_by_reconciled_value);
 
     gnc_tree_view_add_text_column(view, _("Last Reconcile Date"), "last-recon-date", NULL,
                                   "Last Reconcile Date",
@@ -834,12 +834,12 @@
                                      GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                      sort_by_future_min_value);
     priv->future_min_report_column
-    =  gnc_tree_view_add_numeric_column(view, _("Future Minimum (Report)"), "future_min_report",
-                                        SAMPLE_ACCOUNT_VALUE,
-                                        GNC_TREE_MODEL_ACCOUNT_COL_FUTURE_MIN_REPORT,
-                                        GNC_TREE_MODEL_ACCOUNT_COL_COLOR_FUTURE_MIN,
-                                        GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                        sort_by_future_min_value);
+        =  gnc_tree_view_add_numeric_column(view, _("Future Minimum (Report)"), "future_min_report",
+                                            SAMPLE_ACCOUNT_VALUE,
+                                            GNC_TREE_MODEL_ACCOUNT_COL_FUTURE_MIN_REPORT,
+                                            GNC_TREE_MODEL_ACCOUNT_COL_COLOR_FUTURE_MIN,
+                                            GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                            sort_by_future_min_value);
 
     gnc_tree_view_add_numeric_column(view, _("Total"), "total",
                                      SAMPLE_ACCOUNT_VALUE,
@@ -848,12 +848,12 @@
                                      GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                      sort_by_total_value);
     priv->total_report_column
-    = gnc_tree_view_add_numeric_column(view, _("Total (Report)"), "total_report",
-                                       SAMPLE_ACCOUNT_VALUE,
-                                       GNC_TREE_MODEL_ACCOUNT_COL_TOTAL_REPORT,
-                                       GNC_TREE_MODEL_ACCOUNT_COL_COLOR_TOTAL,
-                                       GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                       sort_by_total_value);
+        = gnc_tree_view_add_numeric_column(view, _("Total (Report)"), "total_report",
+                                           SAMPLE_ACCOUNT_VALUE,
+                                           GNC_TREE_MODEL_ACCOUNT_COL_TOTAL_REPORT,
+                                           GNC_TREE_MODEL_ACCOUNT_COL_COLOR_TOTAL,
+                                           GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                           sort_by_total_value);
 
     gnc_tree_view_add_numeric_column(view, _("Total (Period)"), "total-period",
                                      SAMPLE_ACCOUNT_VALUE,
@@ -864,11 +864,11 @@
 
     /* Translators: The C is the column title and stands for Color, this should be one character */
     acc_color_column
-    = gnc_tree_view_add_text_column(view, _("C"), "account-color", NULL,
-                                    "xx",
-                                    GNC_TREE_VIEW_COLUMN_DATA_NONE,
-                                    GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                    NULL);
+        = gnc_tree_view_add_text_column(view, _("C"), "account-color", NULL,
+                                        "xx",
+                                        GNC_TREE_VIEW_COLUMN_DATA_NONE,
+                                        GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                        NULL);
 
     renderer = gnc_tree_view_column_get_renderer(acc_color_column);
 
@@ -882,17 +882,17 @@
                                             GTK_TREE_VIEW(view),
                                             NULL);
     priv->notes_column
-    = gnc_tree_view_add_text_column(view, _("Notes"), "notes", NULL,
-                                    "Sample account notes.",
-                                    GNC_TREE_MODEL_ACCOUNT_COL_NOTES,
-                                    GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                    sort_by_string);
+        = gnc_tree_view_add_text_column(view, _("Notes"), "notes", NULL,
+                                        "Sample account notes.",
+                                        GNC_TREE_MODEL_ACCOUNT_COL_NOTES,
+                                        GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                        sort_by_string);
     tax_info_column
-    = gnc_tree_view_add_text_column(view, _("Tax Info"), "tax-info", NULL,
-                                    "Sample tax info.",
-                                    GNC_TREE_MODEL_ACCOUNT_COL_TAX_INFO,
-                                    GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                    sort_by_string);
+        = gnc_tree_view_add_text_column(view, _("Tax Info"), "tax-info", NULL,
+                                        "Sample tax info.",
+                                        GNC_TREE_MODEL_ACCOUNT_COL_TAX_INFO,
+                                        GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                        sort_by_string);
 
     renderer = gnc_tree_view_column_get_renderer(tax_info_column);
     gtk_tree_view_column_set_cell_data_func(tax_info_column,

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -395,22 +395,22 @@
     sample_currency = gnc_commodity_get_fullname(gnc_default_currency());
 
     priv->name_column
-    = gnc_tree_view_add_text_column(view, _("Owner Name"), GNC_OWNER_TREE_NAME_COL,
-                                    NULL, "GnuCash Inc.",
-                                    GNC_TREE_MODEL_OWNER_COL_NAME,
-                                    GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                    sort_by_string);
+        = gnc_tree_view_add_text_column(view, _("Owner Name"), GNC_OWNER_TREE_NAME_COL,
+                                        NULL, "GnuCash Inc.",
+                                        GNC_TREE_MODEL_OWNER_COL_NAME,
+                                        GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                        sort_by_string);
     gnc_tree_view_add_text_column(view, _("Type"), GNC_OWNER_TREE_TYPE_COL,
                                   NULL, sample_type,
                                   GNC_TREE_MODEL_OWNER_COL_TYPE,
                                   GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                   sort_by_string);
     priv->id_column
-    = gnc_tree_view_add_text_column(view, _("Owner ID"), GNC_OWNER_TREE_ID_COL,
-                                    NULL, "1-123-1234",
-                                    GNC_TREE_MODEL_OWNER_COL_ID,
-                                    GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                    sort_by_string);
+        = gnc_tree_view_add_text_column(view, _("Owner ID"), GNC_OWNER_TREE_ID_COL,
+                                        NULL, "1-123-1234",
+                                        GNC_TREE_MODEL_OWNER_COL_ID,
+                                        GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                        sort_by_string);
     gnc_tree_view_add_text_column(view, _("Currency"), GNC_OWNER_TREE_CURRENCY_COL,
                                   NULL, sample_currency,
                                   GNC_TREE_MODEL_OWNER_COL_CURRENCY,
@@ -464,19 +464,19 @@
                                      sort_by_balance_value);
 
     priv->balance_report_column
-    = gnc_tree_view_add_numeric_column(view, _("Balance"), GNC_OWNER_TREE_BALANCE_REPORT_COL,
-                                       SAMPLE_OWNER_VALUE,
-                                       GNC_TREE_MODEL_OWNER_COL_BALANCE_REPORT,
-                                       GNC_TREE_MODEL_OWNER_COL_COLOR_BALANCE,
-                                       GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                       sort_by_balance_value);
+        = gnc_tree_view_add_numeric_column(view, _("Balance"), GNC_OWNER_TREE_BALANCE_REPORT_COL,
+                                           SAMPLE_OWNER_VALUE,
+                                           GNC_TREE_MODEL_OWNER_COL_BALANCE_REPORT,
+                                           GNC_TREE_MODEL_OWNER_COL_COLOR_BALANCE,
+                                           GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                           sort_by_balance_value);
 
     priv->notes_column
-    = gnc_tree_view_add_text_column(view, _("Notes"), GNC_OWNER_TREE_NOTES_COL, NULL,
-                                    "Sample owner notes.",
-                                    GNC_TREE_MODEL_OWNER_COL_NOTES,
-                                    GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-                                    sort_by_string);
+        = gnc_tree_view_add_text_column(view, _("Notes"), GNC_OWNER_TREE_NOTES_COL, NULL,
+                                        "Sample owner notes.",
+                                        GNC_TREE_MODEL_OWNER_COL_NOTES,
+                                        GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+                                        sort_by_string);
     gnc_tree_view_add_toggle_column (view, _("Active"),
                                      /* Translators: This string has a context prefix; the translation
                                         must only contain the part after the | character. */

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -97,7 +97,7 @@
 static gchar *gnc_tree_view_get_sort_order (GncTreeView *view);
 static gchar *gnc_tree_view_get_sort_column (GncTreeView *view);
 static gchar **gnc_tree_view_get_column_order (GncTreeView *view,
-                                                     gsize *length);
+        gsize *length);
 
 /** Private Data Structure ***********************************************/
 
@@ -385,7 +385,7 @@
 
             key = g_strjoin ("_", name, STATE_KEY_SUFF_WIDTH, NULL);
             if (gtk_tree_view_column_get_fixed_width (column)
-                   != gtk_tree_view_column_get_width (column))
+                    != gtk_tree_view_column_get_width (column))
             {
                 g_key_file_set_integer (state_file, priv->state_section, key,
                                         gtk_tree_view_column_get_width (column));
@@ -1051,68 +1051,68 @@
     {
         gsize num_keys, idx;
         gchar **keys = g_key_file_get_keys (state_file, priv->state_section, &num_keys, NULL);
-            for (idx = 0; idx < num_keys; idx++)
+        for (idx = 0; idx < num_keys; idx++)
+        {
+            gchar *key = keys[idx];
+            if (g_strcmp0 (key, STATE_KEY_SORT_COLUMN) == 0)
             {
-                gchar *key = keys[idx];
-                if (g_strcmp0 (key, STATE_KEY_SORT_COLUMN) == 0)
+                gnc_tree_view_set_sort_column (view,
+                                               g_key_file_get_string (state_file, priv->state_section, key, NULL));
+            }
+            else if (g_strcmp0 (key, STATE_KEY_SORT_ORDER) == 0)
+            {
+                gnc_tree_view_set_sort_order (view,
+                                              g_key_file_get_string (state_file, priv->state_section, key, NULL));
+            }
+            else if (g_strcmp0 (key, STATE_KEY_COLUMN_ORDER) == 0)
+            {
+                gsize length;
+                gchar **columns = g_key_file_get_string_list (state_file, priv->state_section,
+                                  key, &length, NULL);
+                gnc_tree_view_set_column_order (view, columns, length);
+                g_strfreev (columns);
+            }
+            else
+            {
+                /* Make a copy of the local part of the key so it can be split
+                 * into column name and key type */
+                gboolean known = FALSE;
+                gchar *column_name = g_strdup (key);
+                gchar *type_name = g_strrstr (column_name, "_");
+                *type_name++ = '\0';
+
+                if (g_strcmp0 (type_name, STATE_KEY_SUFF_VISIBLE) == 0)
                 {
-                    gnc_tree_view_set_sort_column (view,
-                            g_key_file_get_string (state_file, priv->state_section, key, NULL));
-                }
-                else if (g_strcmp0 (key, STATE_KEY_SORT_ORDER) == 0)
-                {
-                    gnc_tree_view_set_sort_order (view,
-                            g_key_file_get_string (state_file, priv->state_section, key, NULL));
-                }
-                else if (g_strcmp0 (key, STATE_KEY_COLUMN_ORDER) == 0)
-                {
-                    gsize length;
-                    gchar **columns = g_key_file_get_string_list (state_file, priv->state_section,
-                                                                  key, &length, NULL);
-                    gnc_tree_view_set_column_order (view, columns, length);
-                    g_strfreev (columns);
-                }
-                else
-                {
-                    /* Make a copy of the local part of the key so it can be split
-                     * into column name and key type */
-                    gboolean known = FALSE;
-                    gchar *column_name = g_strdup (key);
-                    gchar *type_name = g_strrstr (column_name, "_");
-                    *type_name++ = '\0';
-
-                    if (g_strcmp0 (type_name, STATE_KEY_SUFF_VISIBLE) == 0)
+                    GtkTreeViewColumn *column = gnc_tree_view_find_column_by_name (view, column_name);
+                    if (column)
                     {
-                        GtkTreeViewColumn *column = gnc_tree_view_find_column_by_name (view, column_name);
-                        if (column)
+                        known = TRUE;
+                        if (!g_object_get_data (G_OBJECT (column), ALWAYS_VISIBLE))
                         {
-                            known = TRUE;
-                            if (!g_object_get_data (G_OBJECT (column), ALWAYS_VISIBLE))
-                            {
-                                gtk_tree_view_column_set_visible (column,
-                                        g_key_file_get_boolean (state_file, priv->state_section, key, NULL));
-                            }
+                            gtk_tree_view_column_set_visible (column,
+                                                              g_key_file_get_boolean (state_file, priv->state_section, key, NULL));
                         }
                     }
-                    else if (g_strcmp0 (type_name, STATE_KEY_SUFF_WIDTH) == 0)
+                }
+                else if (g_strcmp0 (type_name, STATE_KEY_SUFF_WIDTH) == 0)
+                {
+                    gint width = g_key_file_get_integer (state_file, priv->state_section, key, NULL);
+                    GtkTreeViewColumn *column = gnc_tree_view_find_column_by_name (view, column_name);
+                    if (column)
                     {
-                        gint width = g_key_file_get_integer (state_file, priv->state_section, key, NULL);
-                        GtkTreeViewColumn *column = gnc_tree_view_find_column_by_name (view, column_name);
-                        if (column)
+                        known = TRUE;
+                        if (width && (width != gtk_tree_view_column_get_width (column)))
                         {
-                            known = TRUE;
-                            if (width && (width != gtk_tree_view_column_get_width (column)))
-                            {
-                                gtk_tree_view_column_set_fixed_width (column, width);
-                            }
+                            gtk_tree_view_column_set_fixed_width (column, width);
                         }
                     }
-                    if (!known)
-                        DEBUG ("Ignored key %s", key);
+                }
+                if (!known)
+                    DEBUG ("Ignored key %s", key);
 
-                    g_free (column_name);
-                }
+                g_free (column_name);
             }
+        }
     }
 
     /* Rebuild the column visibility menu */
@@ -1645,9 +1645,9 @@
         if (column_sort_fn)
         {
             gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(s_model),
-                                         data_column, column_sort_fn,
-                                         GINT_TO_POINTER(data_column),
-                                         NULL /* destroy fn */);
+                                             data_column, column_sort_fn,
+                                             GINT_TO_POINTER(data_column),
+                                             NULL /* destroy fn */);
         }
     }
 
@@ -1659,9 +1659,9 @@
         if (column_sort_fn)
         {
             gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(priv->sort_model),
-                                         data_column, column_sort_fn,
-                                         view,
-                                         NULL /* destroy fn */);
+                                             data_column, column_sort_fn,
+                                             view,
+                                             NULL /* destroy fn */);
         }
     }
 
@@ -1804,58 +1804,59 @@
  */
 GtkTreeViewColumn *
 gnc_tree_view_add_date_column (GncTreeView *view,
-                                   const gchar *column_title,
-                                   const gchar *pref_name,
-                                   const gchar *stock_icon_name,
-                                   const gchar *sizing_text,
-                                   gint model_data_column,
-                                   gint model_visibility_column,
-                                   GtkTreeIterCompareFunc column_sort_fn)
+                               const gchar *column_title,
+                               const gchar *pref_name,
+                               const gchar *stock_icon_name,
+                               const gchar *sizing_text,
+                               gint model_data_column,
+                               gint model_visibility_column,
+                               GtkTreeIterCompareFunc column_sort_fn)
 {
-  GtkTreeViewColumn *column;
-  GtkCellRenderer *renderer;
-  PangoLayout* layout;
-  int default_width, title_width;
+    GtkTreeViewColumn *column;
+    GtkCellRenderer *renderer;
+    PangoLayout* layout;
+    int default_width, title_width;
 
-  g_return_val_if_fail (GNC_IS_TREE_VIEW(view), NULL);
+    g_return_val_if_fail (GNC_IS_TREE_VIEW(view), NULL);
 
-  column = gtk_tree_view_column_new ();
-  gtk_tree_view_column_set_title (column, column_title);
+    column = gtk_tree_view_column_new ();
+    gtk_tree_view_column_set_title (column, column_title);
 
-  /* Set up an icon renderer if requested */
-  if (stock_icon_name) {
-    renderer = gtk_cell_renderer_pixbuf_new ();
-    g_object_set (renderer, "stock-id", stock_icon_name, NULL);
-    gtk_tree_view_column_pack_start (column, renderer, FALSE);
-  }
+    /* Set up an icon renderer if requested */
+    if (stock_icon_name)
+    {
+        renderer = gtk_cell_renderer_pixbuf_new ();
+        g_object_set (renderer, "stock-id", stock_icon_name, NULL);
+        gtk_tree_view_column_pack_start (column, renderer, FALSE);
+    }
 
-  /* Set up a text renderer and attributes */
-  renderer = gnc_cell_renderer_date_new(TRUE);
-  gtk_tree_view_column_pack_start (column, renderer, TRUE);
+    /* Set up a text renderer and attributes */
+    renderer = gnc_cell_renderer_date_new(TRUE);
+    gtk_tree_view_column_pack_start (column, renderer, TRUE);
 
-  /* Set renderer attributes controlled by the model */
-  if (model_data_column != GNC_TREE_VIEW_COLUMN_DATA_NONE)
-    gtk_tree_view_column_add_attribute (column, renderer,
-					"text", model_data_column);
-  if (model_visibility_column != GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS)
-    gtk_tree_view_column_add_attribute (column, renderer,
-					"visible", model_visibility_column);
+    /* Set renderer attributes controlled by the model */
+    if (model_data_column != GNC_TREE_VIEW_COLUMN_DATA_NONE)
+        gtk_tree_view_column_add_attribute (column, renderer,
+                                            "text", model_data_column);
+    if (model_visibility_column != GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS)
+        gtk_tree_view_column_add_attribute (column, renderer,
+                                            "visible", model_visibility_column);
 
-  /* Default size is the larger of the column title and the sizing text */
-  layout = gtk_widget_create_pango_layout (GTK_WIDGET(view), column_title);
-  pango_layout_get_pixel_size(layout, &title_width, NULL);
-  g_object_unref(layout);
-  layout = gtk_widget_create_pango_layout (GTK_WIDGET(view), sizing_text);
-  pango_layout_get_pixel_size(layout, &default_width, NULL);
-  g_object_unref(layout);
-  default_width = MAX(default_width, title_width);
-  if (default_width)
-    default_width += 10; /* padding on either side */
-  gnc_tree_view_column_properties (view, column, pref_name, model_data_column,
-				   default_width, TRUE, column_sort_fn);
+    /* Default size is the larger of the column title and the sizing text */
+    layout = gtk_widget_create_pango_layout (GTK_WIDGET(view), column_title);
+    pango_layout_get_pixel_size(layout, &title_width, NULL);
+    g_object_unref(layout);
+    layout = gtk_widget_create_pango_layout (GTK_WIDGET(view), sizing_text);
+    pango_layout_get_pixel_size(layout, &default_width, NULL);
+    g_object_unref(layout);
+    default_width = MAX(default_width, title_width);
+    if (default_width)
+        default_width += 10; /* padding on either side */
+    gnc_tree_view_column_properties (view, column, pref_name, model_data_column,
+                                     default_width, TRUE, column_sort_fn);
 
-  gnc_tree_view_append_column (view, column);
-  return column;
+    gnc_tree_view_append_column (view, column);
+    return column;
 }
 
 

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view.h	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view.h	2013-10-31 22:22:53 UTC (rev 23358)
@@ -224,13 +224,13 @@
  */
 GtkTreeViewColumn *
 gnc_tree_view_add_date_column (GncTreeView *view,
-                                   const gchar *column_title,
-                                   const gchar *pref_name,
-                                   const gchar *stock_icon_name,
-                                   const gchar *sizing_text,
-                                   gint model_data_column,
-                                   gint model_visibility_column,
-                                   GtkTreeIterCompareFunc column_sort_fn);
+                               const gchar *column_title,
+                               const gchar *pref_name,
+                               const gchar *stock_icon_name,
+                               const gchar *sizing_text,
+                               gint model_data_column,
+                               gint model_visibility_column,
+                               GtkTreeIterCompareFunc column_sort_fn);
 
 
 /** This function adds a new numeric column to a GncTreeView base
@@ -386,7 +386,7 @@
  */
 void
 gnc_tree_view_set_control_column_background (GncTreeView *view, gint column,
-                                             GtkTreeCellDataFunc func);
+        GtkTreeCellDataFunc func);
 
 /** This allows the columns to be setup without the model connected
  *

Modified: gnucash/trunk/src/gnome-utils/window-main-summarybar.c
===================================================================
--- gnucash/trunk/src/gnome-utils/window-main-summarybar.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/gnome-utils/window-main-summarybar.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -395,7 +395,7 @@
 
             currency_accum = current->data;
 
-	    mnemonic = gnc_commodity_get_nice_symbol (currency_accum->currency);
+            mnemonic = gnc_commodity_get_nice_symbol (currency_accum->currency);
             if (mnemonic == NULL)
                 mnemonic = "";
 
@@ -508,7 +508,7 @@
     gnc_main_window_summary_refresh(retval);
 
     retval->cnxn_id =  gnc_prefs_register_cb (GNC_PREFS_GROUP, NULL,
-                                              prefs_changed_cb, retval);
+                       prefs_changed_cb, retval);
 
     return retval->hbox;
 }

Modified: gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -104,8 +104,8 @@
 gnc_GWEN_Gui_set_close_flag(gboolean close_when_finished)
 {
     gnc_prefs_set_bool(
-            GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
-            close_when_finished);
+        GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
+        close_when_finished);
 }
 gboolean
 gnc_GWEN_Gui_get_close_flag()
@@ -295,7 +295,7 @@
 #ifdef USING_GWENHYWFAR_GTK2_GUI
             Gtk2_Gui_new()
 #else
-        GWEN_Gui_new()
+            GWEN_Gui_new()
 #endif
             ;
 
@@ -392,8 +392,8 @@
 gnc_GWEN_Gui_set_close_flag(gboolean close_when_finished)
 {
     gnc_prefs_set_bool(
-            GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
-            close_when_finished);
+        GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
+        close_when_finished);
 
     if (full_gui)
     {
@@ -718,8 +718,8 @@
 
     /* Remember whether the dialog is to be closed when finished */
     gnc_prefs_set_bool(
-            GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
-            gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gui->close_checkbutton)));
+        GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
+        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gui->close_checkbutton)));
 
     /* Remember size and position of the dialog */
     gnc_save_window_size(GNC_PREFS_GROUP_CONNECTION, GTK_WINDOW(gui->dialog));
@@ -1616,8 +1616,8 @@
     ENTER("gui=%p", gui);
 
     gnc_prefs_set_bool(
-            GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
-            gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+        GNC_PREFS_GROUP_AQBANKING, GNC_PREF_CLOSE_ON_FINISH,
+        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 
     LEAVE(" ");
 }

Modified: gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c
===================================================================
--- gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -1028,8 +1028,8 @@
     info->export_type = export_type;
     csv_export_assistant_create (info);
     gnc_register_gui_component (ASSISTANT_CSV_EXPORT_CM_CLASS,
-				NULL, csv_export_close_handler,
-				info);
+                                NULL, csv_export_close_handler,
+                                info);
     gtk_widget_show_all (info->window);
     gnc_window_adjust_for_screen (GTK_WINDOW(info->window));
 }

Modified: gnucash/trunk/src/import-export/csv-export/csv-transactions-export.c
===================================================================
--- gnucash/trunk/src/import-export/csv-export/csv-transactions-export.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/csv-export/csv-transactions-export.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -341,16 +341,16 @@
 
         /* Header string */
         header = g_strconcat ( end_sep, _("Date"), mid_sep, _("Account Name"), mid_sep,
-                                (num_action ? _("Transaction Number") : _("Number")),
-                                mid_sep, _("Description"), mid_sep, _("Notes"),
-                                mid_sep, _("Memo"), mid_sep, _("Category"), mid_sep,
-                                _("Type"), mid_sep,
-                                (num_action ? _("Number/Action") : _("Action")),
-                                mid_sep, _("Reconcile"), mid_sep,
-                                _("To With Sym"), mid_sep, _("From With Sym"), mid_sep,
-                                _("To Num."), mid_sep, _("From Num."), mid_sep,
-                                _("To Rate/Price"), mid_sep, _("From Rate/Price"),
-                                end_sep, "\n", NULL);
+                               (num_action ? _("Transaction Number") : _("Number")),
+                               mid_sep, _("Description"), mid_sep, _("Notes"),
+                               mid_sep, _("Memo"), mid_sep, _("Category"), mid_sep,
+                               _("Type"), mid_sep,
+                               (num_action ? _("Number/Action") : _("Action")),
+                               mid_sep, _("Reconcile"), mid_sep,
+                               _("To With Sym"), mid_sep, _("From With Sym"), mid_sep,
+                               _("To Num."), mid_sep, _("From Num."), mid_sep,
+                               _("To Rate/Price"), mid_sep, _("From Rate/Price"),
+                               end_sep, "\n", NULL);
         DEBUG("Header String: %s", header);
 
         /* Write header line */

Modified: gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.c
===================================================================
--- gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -95,19 +95,19 @@
     q = dest = g_malloc (strlen (source) * 2 + 1);
 
     while (*p)
-      {
+    {
         switch (*p)
-          {
-          case '_':
+        {
+        case '_':
             *q++ = '_';
             *q++ = '_';
             break;
-          default:
+        default:
             *q++ = *p;
             break;
-          }
+        }
         p++;
-      }
+    }
     *q = 0;
     return dest;
 }
@@ -672,8 +672,8 @@
     csv_import_assistant_create (info);
 
     gnc_register_gui_component (ASSISTANT_CSV_IMPORT_CM_CLASS,
-				NULL, csv_import_close_handler,
-				info);
+                                NULL, csv_import_close_handler,
+                                info);
 
     gtk_widget_show_all (info->window);
 

Modified: gnucash/trunk/src/import-export/csv-import/assistant-csv-trans-import.c
===================================================================
--- gnucash/trunk/src/import-export/csv-import/assistant-csv-trans-import.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/csv-import/assistant-csv-trans-import.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -1719,7 +1719,7 @@
         for (i = 0; i < SEP_NUM_OF_TYPES; i++)
         {
             info->sep_buttons[i]
-            = (GtkCheckButton*)GTK_WIDGET(gtk_builder_get_object (builder, sep_button_names[i]));
+                = (GtkCheckButton*)GTK_WIDGET(gtk_builder_get_object (builder, sep_button_names[i]));
             /* Connect them to the sep_button_clicked event handler. */
             g_signal_connect(G_OBJECT(info->sep_buttons[i]), "toggled",
                              G_CALLBACK(sep_button_clicked), (gpointer)info);
@@ -1728,7 +1728,7 @@
         /* Load and connect the custom separator checkbutton in the same way
          * as the other separator buttons. */
         info->custom_cbutton
-        = (GtkCheckButton*)GTK_WIDGET(gtk_builder_get_object (builder, "custom_cbutton"));
+            = (GtkCheckButton*)GTK_WIDGET(gtk_builder_get_object (builder, "custom_cbutton"));
         g_signal_connect(G_OBJECT(info->custom_cbutton), "clicked",
                          G_CALLBACK(sep_button_clicked), (gpointer)info);
 
@@ -1844,8 +1844,8 @@
     csv_import_trans_assistant_create (info);
 
     gnc_register_gui_component (ASSISTANT_CSV_IMPORT_TRANS_CM_CLASS,
-				NULL, csv_import_trans_close_handler,
-				info);
+                                NULL, csv_import_trans_close_handler,
+                                info);
 
     gtk_widget_show_all (info->window);
 

Modified: gnucash/trunk/src/import-export/csv-import/gnc-csv-model.c
===================================================================
--- gnucash/trunk/src/import-export/csv-import/gnc-csv-model.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/csv-import/gnc-csv-model.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -42,14 +42,14 @@
 
 /* This array contains all of the different strings for different column types. */
 gchar* gnc_csv_column_type_strs[GNC_CSV_NUM_COL_TYPES] = {N_("None"),
-        N_("Date"),
-        N_("Num"),
-        N_("Description"),
-        N_("Notes"),
-        N_("Account"),
-        N_("Deposit"),
-        N_("Withdrawal"),
-        N_("Balance")
+                                                          N_("Date"),
+                                                          N_("Num"),
+                                                          N_("Description"),
+                                                          N_("Notes"),
+                                                          N_("Account"),
+                                                          N_("Deposit"),
+                                                          N_("Withdrawal"),
+                                                          N_("Balance")
                                                          };
 
 /** A set of sensible defaults for parsing CSV files.
@@ -193,8 +193,8 @@
     retvalue.tm_isdst = test_retvalue.tm_isdst;
     rawtime = gnc_mktime (&retvalue);
     if (retvalue.tm_mday == orig_day &&
-    retvalue.tm_mon == orig_month &&
-    retvalue.tm_year == orig_year)
+            retvalue.tm_mon == orig_month &&
+            retvalue.tm_year == orig_year)
     {
         return rawtime;
     }
@@ -291,8 +291,8 @@
     retvalue.tm_isdst = test_retvalue.tm_isdst;
     rawtime = gnc_mktime (&retvalue);
     if (retvalue.tm_mday == orig_day &&
-    retvalue.tm_mon == orig_month &&
-    retvalue.tm_year == orig_year)
+            retvalue.tm_mon == orig_month &&
+            retvalue.tm_year == orig_year)
     {
         return rawtime;
     }
@@ -329,7 +329,7 @@
      * gnc_csv_parse_data_free is called before all of the data is
      * initialized, only the data that needs to be freed is freed. */
     parse_data->raw_str.begin = parse_data->raw_str.end
-    = parse_data->file_str.begin = parse_data->file_str.end = NULL;
+                                = parse_data->file_str.begin = parse_data->file_str.end = NULL;
     parse_data->orig_lines = NULL;
     parse_data->orig_row_lengths = NULL;
     parse_data->column_types = NULL;
@@ -400,7 +400,7 @@
  * @return 0 on success, 1 on failure
  */
 int gnc_csv_convert_encoding(GncCsvParseData* parse_data, const char* encoding,
-GError** error)
+                             GError** error)
 {
     gsize bytes_read, bytes_written;
 
@@ -413,9 +413,9 @@
 
     /* Do the actual translation to UTF-8. */
     parse_data->file_str.begin = g_convert(parse_data->raw_str.begin,
-    parse_data->raw_str.end - parse_data->raw_str.begin,
-    "UTF-8", encoding, &bytes_read, &bytes_written,
-    error);
+                                           parse_data->raw_str.end - parse_data->raw_str.begin,
+                                           "UTF-8", encoding, &bytes_read, &bytes_written,
+                                           error);
     /* Handle errors that occur. */
     if (parse_data->file_str.begin == NULL)
         return 1;
@@ -440,7 +440,7 @@
  * @return 0 on success, 1 on failure
  */
 int gnc_csv_load_file(GncCsvParseData* parse_data, const char* filename,
-GError** error)
+                      GError** error)
 {
     const char* guess_enc = NULL;
 
@@ -463,8 +463,8 @@
     /* Make a guess at the encoding of the data. */
     if (!g_mapped_file_get_length(parse_data->raw_mapping) == 0)
         guess_enc = go_guess_encoding((const char*)(parse_data->raw_str.begin),
-        (size_t)(parse_data->raw_str.end - parse_data->raw_str.begin),
-        "UTF-8", NULL);
+                                      (size_t)(parse_data->raw_str.end - parse_data->raw_str.begin),
+                                      "UTF-8", NULL);
     if (guess_enc == NULL)
     {
         g_set_error(error, 0, GNC_CSV_ENCODING_ERR, "%s", _("Unknown encoding."));
@@ -509,8 +509,8 @@
     {
         /* Do the actual parsing. */
         parse_data->orig_lines = stf_parse_general(parse_data->options, parse_data->chunk,
-        parse_data->file_str.begin,
-        parse_data->file_str.end);
+                                 parse_data->file_str.begin,
+                                 parse_data->file_str.end);
     }
     /* If we couldn't get the encoding right, we just want an empty array. */
     else
@@ -523,7 +523,7 @@
         g_array_free(parse_data->orig_row_lengths, FALSE);
 
     parse_data->orig_row_lengths =
-    g_array_sized_new(FALSE, FALSE, sizeof(int), parse_data->orig_lines->len);
+        g_array_sized_new(FALSE, FALSE, sizeof(int), parse_data->orig_lines->len);
 
     g_array_set_size(parse_data->orig_row_lengths, parse_data->orig_lines->len);
     parse_data->orig_max_row = 0;
@@ -558,7 +558,7 @@
         /* Create parse_data->column_types and fill it with guesses based
          * on the contents of each column. */
         parse_data->column_types = g_array_sized_new(FALSE, FALSE, sizeof(int),
-        max_cols);
+                                   max_cols);
         g_array_set_size(parse_data->column_types, max_cols);
         /* TODO Make it actually guess. */
         for (i = 0; i < parse_data->column_types->len; i++)
@@ -666,7 +666,7 @@
 
         /* Go through str_dupe looking for currency symbols. */
         for (possible_currency_symbol = str_dupe; *possible_currency_symbol;
-        possible_currency_symbol = g_utf8_next_char(possible_currency_symbol))
+                possible_currency_symbol = g_utf8_next_char(possible_currency_symbol))
         {
             if (g_unichar_type(g_utf8_get_char(possible_currency_symbol)) == G_UNICODE_CURRENCY_SYMBOL)
             {
@@ -772,7 +772,7 @@
  * @param amount The amount of the split
  */
 static void trans_add_split(Transaction* trans, Account* account, QofBook* book,
-gnc_numeric amount, const char *num)
+                            gnc_numeric amount, const char *num)
 {
     Split* split = xaccMallocSplit(book);
     xaccSplitSetAccount(split, account);
@@ -935,7 +935,7 @@
             break;
 
         case GNC_CSV_NUM:
-            /* the 'num' is saved and passed to 'trans_add_split' below where 
+            /* the 'num' is saved and passed to 'trans_add_split' below where
              * 'gnc_set_num_action' is used to set tran-num and/or split-action
              * per book option */
             num = g_strdup ((char*)(prop->value));
@@ -1232,7 +1232,7 @@
                 }
 
                 trans_add_split(trans_line->trans, account,
-                        gnc_account_get_book(account), amount, trans_line->num);
+                                gnc_account_get_book(account), amount, trans_line->num);
                 if (trans_line->num)
                     g_free(trans_line->num);
 

Modified: gnucash/trunk/src/import-export/import-account-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-account-matcher.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/import-account-matcher.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -258,33 +258,33 @@
                     /* This argument will only be used as a "const char*" */
                     (void*)account_online_id_value);
 
-	/* BEGIN: try again without extra space at the end */
-	/*
-	 * libofx, used for file import, generates online_id as
-	 * ACCTID + space + ACCTKEY which differs from the online_id
-	 * generated by aqbanking for online ofx transfer as ACCTID.
-	 *
-	 * If a gnucash account has been associated with an online_id
-	 * via aqbanking data, it is not possible to construct an OFX
-	 * file for gnucash import that matches the same online_id
-	 * because even with no ACCTKEY in the file, there will be a
-	 * trailing space.
-	 *
-	 * This is a hack to overcome that problem.
-	 */
-	if ((retval == NULL) && g_str_has_suffix(account_online_id_value, " "))
-	{
-	    gchar *trimmed = g_strndup(account_online_id_value, strlen(account_online_id_value) - 1);
-	    if (trimmed)
-	    {
-		retval = gnc_account_foreach_descendant_until(
-		    gnc_get_current_root_account (),
-		    test_acct_online_id_match,
-		    (void *)trimmed);
-	    }
-	    g_free(trimmed);
-	}
-	/* END: try again without extra space at the end */
+        /* BEGIN: try again without extra space at the end */
+        /*
+         * libofx, used for file import, generates online_id as
+         * ACCTID + space + ACCTKEY which differs from the online_id
+         * generated by aqbanking for online ofx transfer as ACCTID.
+         *
+         * If a gnucash account has been associated with an online_id
+         * via aqbanking data, it is not possible to construct an OFX
+         * file for gnucash import that matches the same online_id
+         * because even with no ACCTKEY in the file, there will be a
+         * trailing space.
+         *
+         * This is a hack to overcome that problem.
+         */
+        if ((retval == NULL) && g_str_has_suffix(account_online_id_value, " "))
+        {
+            gchar *trimmed = g_strndup(account_online_id_value, strlen(account_online_id_value) - 1);
+            if (trimmed)
+            {
+                retval = gnc_account_foreach_descendant_until(
+                             gnc_get_current_root_account (),
+                             test_acct_online_id_match,
+                             (void *)trimmed);
+            }
+            g_free(trimmed);
+        }
+        /* END: try again without extra space at the end */
     }
     if (retval == NULL && auto_create != 0)
     {

Modified: gnucash/trunk/src/import-export/import-backend.c
===================================================================
--- gnucash/trunk/src/import-export/import-backend.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/import-backend.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -945,8 +945,8 @@
             xaccTransBeginEdit(selected_match->trans);
 
             xaccTransSetDatePostedSecsNormalized(selected_match->trans,
-                                       xaccTransGetDate(xaccSplitGetParent(
-                                                   gnc_import_TransInfo_get_fsplit(trans_info))));
+                                                 xaccTransGetDate(xaccSplitGetParent(
+                                                         gnc_import_TransInfo_get_fsplit(trans_info))));
 
             xaccSplitSetAmount(selected_match->split,
                                xaccSplitGetAmount(

Modified: gnucash/trunk/src/import-export/import-format-dialog.c
===================================================================
--- gnucash/trunk/src/import-export/import-format-dialog.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/import-format-dialog.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -119,7 +119,7 @@
     gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( combo ), cell, "text", 0, NULL );
 
     g_signal_connect(G_OBJECT(combo), "changed",
-                         G_CALLBACK(option_changed_cb), index_p);
+                     G_CALLBACK(option_changed_cb), index_p);
 
     gtk_box_pack_start(GTK_BOX(menu_box), GTK_WIDGET(combo), TRUE, TRUE, 0);
 

Modified: gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
===================================================================
--- gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -369,7 +369,8 @@
     {
         /* The hopeful case: We have a posted_date */
         xaccTransSetDatePostedSecsNormalized(transaction, data.date_posted);
-    } else if (data.date_initiated_valid && (data.date_initiated != 0))
+    }
+    else if (data.date_initiated_valid && (data.date_initiated != 0))
     {
         /* No posted date? Maybe we have an initiated_date */
         xaccTransSetDatePostedSecsNormalized(transaction, data.date_initiated);
@@ -535,13 +536,13 @@
 
                 investment_account_onlineid = g_strdup_printf( "%s%s", data.account_id, data.unique_id);
                 investment_account = gnc_import_select_account(NULL,
-                                                               investment_account_onlineid,
-                                                               1,
-                                                               investment_account_text,
-                                                               investment_commodity,
-                                                               ACCT_TYPE_STOCK,
-                                                               NULL,
-                                                               NULL);
+                                     investment_account_onlineid,
+                                     1,
+                                     investment_account_text,
+                                     investment_commodity,
+                                     ACCT_TYPE_STOCK,
+                                     NULL,
+                                     NULL);
 
                 // but use it only if that's really the right commodity
                 if (investment_account
@@ -654,7 +655,7 @@
                     else if (data.reference_number_valid)
                     {
                         gnc_set_num_action(transaction, split,
-                                                data.reference_number, NULL);
+                                           data.reference_number, NULL);
                     }
                     if (data.security_data_ptr->memo_valid)
                     {

Modified: gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -2491,14 +2491,14 @@
     if (wind->new_book)
     {
         gtk_assistant_set_page_title (assistant, page,
-            _("Choose the QIF file currency and select Book Options"));
+                                      _("Choose the QIF file currency and select Book Options"));
         gtk_widget_show (wind->book_option_label);
         gtk_widget_show (wind->book_option_message);
     }
     else
     {
         gtk_assistant_set_page_title (assistant, page,
-            _("Choose the QIF file currency"));
+                                      _("Choose the QIF file currency"));
         gtk_widget_hide (wind->book_option_label);
         gtk_widget_hide (wind->book_option_message);
     }

Modified: gnucash/trunk/src/plugins/bi_import/dialog-bi-import.c
===================================================================
--- gnucash/trunk/src/plugins/bi_import/dialog-bi-import.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/plugins/bi_import/dialog-bi-import.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -72,7 +72,7 @@
             temp = g_match_info_fetch_named (match_info, match_name); \
             if (temp) \
             { \
-		g_strstrip( temp ); \
+                g_strstrip( temp ); \
                 gtk_list_store_set (store, &iter, column, temp, -1); \
                 g_free (temp); \
             }
@@ -329,8 +329,8 @@
                     // fix this by using the current date
                     gchar temp[20];
                     GDate date;
-		    g_date_clear (&date, 1);
-		    gnc_gdate_set_today (&date);
+                    g_date_clear (&date, 1);
+                    gnc_gdate_set_today (&date);
                     g_date_strftime (temp, 20, "%x", &date);	// create a locale specific date string
                     g_string_assign (prev_date_opened, temp);
                 }
@@ -525,11 +525,14 @@
     while (valid)
     {
         // Walk through the list, reading each row
-        gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, ID, &id, DATE_OPENED, &date_opened, DATE_POSTED, &date_posted,	// if autoposting requested
-                            DUE_DATE, &due_date,	// if autoposting requested
-                            ACCOUNT_POSTED, &account_posted,	// if autoposting requested
-                            MEMO_POSTED, &memo_posted,	// if autoposting requested
-                            ACCU_SPLITS, &accumulatesplits,	// if autoposting requested
+        gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+                            ID, &id,
+                            DATE_OPENED, &date_opened,
+                            DATE_POSTED, &date_posted,       // if autoposting requested
+                            DUE_DATE, &due_date,             // if autoposting requested
+                            ACCOUNT_POSTED, &account_posted, // if autoposting requested
+                            MEMO_POSTED, &memo_posted,       // if autoposting requested
+                            ACCU_SPLITS, &accumulatesplits,  // if autoposting requested
                             OWNER_ID, &owner_id,
                             BILLING_ID, &billing_id,
                             NOTES, &notes,
@@ -548,7 +551,7 @@
 
         // TODO:  Assign a new invoice number if one is absent.  BUT we don't want to assign a new invoice for every line!!
         // so we'd have to flag this up somehow or add an option in the import GUI.  The former implies that we make
-        // an assumption about what the importer (person) wants to do.  It seems resonable that a CSV file full of items with
+        // an assumption about what the importer (person) wants to do.  It seems reasonable that a CSV file full of items with
         // If an invoice exists then we add to it in this current schema.
         // no predefined invoice number is a new invoice that's in need of a new number.
         // This was  not designed to satisfy the need for repeat invoices however, so maybe we need a another method for this, after all
@@ -562,9 +565,9 @@
         {
             // new invoice
             invoice = gncInvoiceCreate (book);
-/* Protect against thrashing the DB and trying to write the invoice
- * record prematurely */
-	    gncInvoiceBeginEdit (invoice);
+            /* Protect against thrashing the DB and trying to write the invoice
+             * record prematurely */
+            gncInvoiceBeginEdit (invoice);
             gncInvoiceSetID (invoice, id);
             owner = gncOwnerNew ();
             if (g_ascii_strcasecmp (type, "BILL") == 0)
@@ -604,7 +607,7 @@
                 iw =  gnc_ui_invoice_edit (invoice);
                 gnc_plugin_page_invoice_new (iw);
             }
-	    gncInvoiceCommitEdit (invoice);
+            gncInvoiceCommitEdit (invoice);
         }
 // I want to warn the user that an existing billvoice exists, but not every
 // time.
@@ -732,8 +735,8 @@
                     acc = gnc_account_lookup_for_register
                           (gnc_get_current_root_account (), account_posted);
                     gncInvoicePostToAccount (invoice, acc, &d1, &d2,
-					     memo_posted,
-					     text2bool (accumulatesplits));
+                                             memo_posted,
+                                             text2bool (accumulatesplits));
                 }
             }
             g_free (new_id);

Modified: gnucash/trunk/src/report/report-gnome/dialog-custom-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/dialog-custom-report.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/report/report-gnome/dialog-custom-report.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -197,31 +197,31 @@
     g_signal_connect (G_OBJECT (crd->namerenderer), "edited",
                       G_CALLBACK (custom_report_name_edited_cb), crd);
     gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (crd->reportview), -1,
-                                                 "Report Name", crd->namerenderer,
-                                                 "text", COL_NAME,
-                                                 NULL);
+            "Report Name", crd->namerenderer,
+            "text", COL_NAME,
+            NULL);
     crd->namecol = gtk_tree_view_get_column (GTK_TREE_VIEW (crd->reportview), VIEW_COL_NAME);
     gtk_tree_view_column_set_expand (crd->namecol, TRUE);
 
     renderer = gtk_cell_renderer_pixbuf_new();
     g_object_set (G_OBJECT (renderer), "stock-id", GTK_STOCK_EXECUTE, NULL);
     gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (crd->reportview), -1,
-                                                 "R", renderer,
-                                                 NULL);
+            "R", renderer,
+            NULL);
     crd->runcol = gtk_tree_view_get_column (GTK_TREE_VIEW (crd->reportview), VIEW_COL_RUN);
 
     renderer = gtk_cell_renderer_pixbuf_new();
     g_object_set (G_OBJECT (renderer), "stock-id", GTK_STOCK_EDIT, NULL);
     gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (crd->reportview), -1,
-                                                 "E", renderer,
-                                                 NULL);
+            "E", renderer,
+            NULL);
     crd->editcol = gtk_tree_view_get_column (GTK_TREE_VIEW (crd->reportview), VIEW_COL_EDIT);
 
     renderer = gtk_cell_renderer_pixbuf_new();
     g_object_set (G_OBJECT (renderer), "stock-id", GTK_STOCK_DELETE, NULL);
     colnum = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (crd->reportview), -1,
-                                                 "D", renderer,
-                                                 NULL);
+             "D", renderer,
+             NULL);
     crd->delcol = gtk_tree_view_get_column (GTK_TREE_VIEW (crd->reportview), VIEW_COL_DELETE);
 
     model = create_and_fill_report_list(crd);
@@ -404,8 +404,8 @@
     g_return_if_fail ( view != NULL );
 
     if (gtk_tree_view_get_path_at_pos (view, event->x, event->y,
-                                            &path, &column,
-                                            &cellx, &celly))
+                                       &path, &column,
+                                       &cellx, &celly))
     {
         if (column == crd->runcol)
         {
@@ -441,16 +441,16 @@
         custom_report_edit_report_name (guid, crd, new_text);
     else
         gnc_error_dialog(crd->dialog, "%s",
-                _("A custom report with this name already exists, please choose another name.") );
+                         _("A custom report with this name already exists, please choose another name.") );
 
 
 }
 void custom_report_query_tooltip_cb (GtkTreeView  *view,
-        gint        x,
-        gint        y,
-        gboolean    keyboard_mode,
-        GtkTooltip *tooltip,
-        gpointer    data)
+                                     gint        x,
+                                     gint        y,
+                                     gboolean    keyboard_mode,
+                                     GtkTooltip *tooltip,
+                                     gpointer    data)
 {
     CustomReportDialog *crd = data;
     GtkTreePath *path = NULL;

Modified: gnucash/trunk/src/report/report-gnome/dialog-report-column-view.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/dialog-report-column-view.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/report/report-gnome/dialog-report-column-view.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -149,7 +149,7 @@
             if (scm_is_equal (SCM_CAR(rpt_guids), selection))
                 row = i;
             name = gnc_scm_to_locale_string (scm_call_2(template_menu_name, SCM_CAR(rpt_guids),
-                                                   SCM_BOOL_F));
+                                             SCM_BOOL_F));
 
             gtk_list_store_append(store, &iter);
             gtk_list_store_set(store, &iter,
@@ -607,9 +607,9 @@
         {
             current = SCM_LIST4(SCM_CAR(current),
                                 scm_from_int (gtk_spin_button_get_value_as_int
-                                            (GTK_SPIN_BUTTON(colspin))),
+                                              (GTK_SPIN_BUTTON(colspin))),
                                 scm_from_int (gtk_spin_button_get_value_as_int
-                                            (GTK_SPIN_BUTTON(rowspin))),
+                                              (GTK_SPIN_BUTTON(rowspin))),
                                 SCM_BOOL_F);
             scm_gc_unprotect_object(r->contents_list);
             r->contents_list = scm_list_set_x(r->contents_list,

Modified: gnucash/trunk/src/report/report-gnome/dialog-report-style-sheet.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/dialog-report-style-sheet.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/report/report-gnome/dialog-report-style-sheet.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -180,7 +180,7 @@
     SCM              new_ss = SCM_BOOL_F;
     GtkWidget        * template_combo;
     GtkTreeModel     * template_model;
-    GtkTreeIter      iter; 
+    GtkTreeIter      iter;
     GtkWidget        * name_entry;
     gint             dialog_retval;
     GList *template_names = NULL;

Modified: gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c	2013-10-30 14:54:43 UTC (rev 23357)
+++ gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c	2013-10-31 22:22:53 UTC (rev 23358)
@@ -1632,7 +1632,7 @@
         QofDateFormat date_format_here;
         QofDateFormat date_format_old = qof_date_format_get();
         char *format_code = gnc_prefs_get_string(GNC_PREFS_GROUP_REPORT_PDFEXPORT,
-                                                 GNC_PREF_FILENAME_DATE_FMT);
+                            GNC_PREF_FILENAME_DATE_FMT);
         if (*format_code == '\0')
         {
             g_free(format_code);



More information about the gnucash-changes mailing list