From af2630904f64e069362ccff77bd22f784ac73f12 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sat, 26 Feb 2011 14:04:34 +0000 Subject: [PATCH] Re-indentation of source code. This re-indentation was done using astyle-1.24 using the following options: astyle --indent=spaces=4 --brackets=break --pad-oper --pad-header --suffix=none git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20343 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/app-utils/gnc-ui-util.c | 22 ++++++++-------- src/backend/dbi/gnc-backend-dbi.c | 4 +-- src/backend/dbi/test/test-dbi-stuff.c | 2 +- src/core-utils/gnc-main.c | 8 +++--- src/gnome-utils/dialog-totd.c | 2 +- src/gnome-utils/gnc-main-window.c | 2 +- src/import-export/aqbanking/gnc-gwen-gui.c | 2 +- src/libqof/qof/qofsession.c | 30 +++++++++++----------- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/app-utils/gnc-ui-util.c b/src/app-utils/gnc-ui-util.c index cb3d7bb841..96161a2493 100644 --- a/src/app-utils/gnc-ui-util.c +++ b/src/app-utils/gnc-ui-util.c @@ -485,15 +485,15 @@ gnc_ui_account_get_tax_info_string (const Account *account) return NULL; /* tax_related && !code */ else - /* Translators: This and the following strings appear on - * the account tab if the Tax Info column is displayed, - * i.e. if the user wants to record the tax form number - * and location on that tax form which corresponds to this - * gnucash account. For the US Income Tax support in - * gnucash, each tax code that can be assigned to an - * account generally corresponds to a specific line number - * on a paper form and each form has a unique - * identification (e.g., Form 1040, Schedule A). */ + /* Translators: This and the following strings appear on + * the account tab if the Tax Info column is displayed, + * i.e. if the user wants to record the tax form number + * and location on that tax form which corresponds to this + * gnucash account. For the US Income Tax support in + * gnucash, each tax code that can be assigned to an + * account generally corresponds to a specific line number + * on a paper form and each form has a unique + * identification (e.g., Form 1040, Schedule A). */ return g_strdup (_("Tax-related but has no tax code")); } else /* with tax code */ @@ -676,8 +676,8 @@ gnc_ui_account_get_tax_info_sub_acct_string (const Account *account) * on a paper form and each form has a unique * identification (e.g., Form 1040, Schedule A). */ return (sub_acct_tax_number == 0) ? g_strdup ("") : - g_strdup_printf (_("(Tax-related subaccounts: %d)"), - sub_acct_tax_number); + g_strdup_printf (_("(Tax-related subaccounts: %d)"), + sub_acct_tax_number); } else return g_strdup (""); diff --git a/src/backend/dbi/gnc-backend-dbi.c b/src/backend/dbi/gnc-backend-dbi.c index 3014860036..2a5987dde6 100644 --- a/src/backend/dbi/gnc-backend-dbi.c +++ b/src/backend/dbi/gnc-backend-dbi.c @@ -2890,8 +2890,8 @@ conn_test_dbi_library( dbi_conn conn ) dbi_result_free( result ); g_ascii_dtostr( doublestr, sizeof(doublestr), testdouble ); querystr = g_strdup_printf( "INSERT INTO numtest VALUES (%" G_GINT64_FORMAT - ", %" G_GUINT64_FORMAT ", %s)", - testlonglong, testulonglong, doublestr ); + ", %" G_GUINT64_FORMAT ", %s)", + testlonglong, testulonglong, doublestr ); result = dbi_conn_query( conn, querystr ); g_free( querystr ); if ( result == NULL ) diff --git a/src/backend/dbi/test/test-dbi-stuff.c b/src/backend/dbi/test/test-dbi-stuff.c index d1419e6107..d1eb4bc1c9 100644 --- a/src/backend/dbi/test/test-dbi-stuff.c +++ b/src/backend/dbi/test/test-dbi-stuff.c @@ -335,7 +335,7 @@ test_dbi_version_control( const gchar* driver, const gchar* url ) qof_session_ensure_all_data_loaded( sess ); err = qof_session_pop_error( sess ); do_test( err == ERR_SQL_DB_TOO_NEW, "DB Failed to flag too new" ); - cleanup: +cleanup: qbe = qof_session_get_backend( sess ); book = qof_session_get_book( sess ); qof_book_begin_edit( book ); diff --git a/src/core-utils/gnc-main.c b/src/core-utils/gnc-main.c index 5144072fe9..bd60d1dac5 100644 --- a/src/core-utils/gnc-main.c +++ b/src/core-utils/gnc-main.c @@ -92,8 +92,8 @@ gnc_get_svn_version (void) guint gnc_get_long_version() { -return GNUCASH_MAJOR_VERSION * 1000000 + - GNUCASH_MINOR_VERSION * 10000 + - GNUCASH_MICRO_VERSION * 100 + - GNUCASH_NANO_VERSION; + return GNUCASH_MAJOR_VERSION * 1000000 + + GNUCASH_MINOR_VERSION * 10000 + + GNUCASH_MICRO_VERSION * 100 + + GNUCASH_NANO_VERSION; } diff --git a/src/gnome-utils/dialog-totd.c b/src/gnome-utils/dialog-totd.c index 5e6d76e577..65352e082c 100644 --- a/src/gnome-utils/dialog-totd.c +++ b/src/gnome-utils/dialog-totd.c @@ -106,7 +106,7 @@ gnc_new_tip_number (GtkWidget *widget, { tip = g_strdup(""); } - else + else { /* Use printf to do the substitution. Note that if there is no | * in the tip, tip_components[1] will be the terminating NULL, diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index e010e8e2f8..e9875253f2 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -1921,7 +1921,7 @@ main_window_update_page_name (GncPluginPage *page, main_window_find_tab_event(window, page, &event_box); if (old_page_long_name && old_page_name - && g_strrstr(old_page_long_name, old_page_name) != NULL) + && g_strrstr(old_page_long_name, old_page_name) != NULL) { gchar *new_page_long_name; gint string_position; diff --git a/src/import-export/aqbanking/gnc-gwen-gui.c b/src/import-export/aqbanking/gnc-gwen-gui.c index d423c18f96..c1b68c66a9 100644 --- a/src/import-export/aqbanking/gnc-gwen-gui.c +++ b/src/import-export/aqbanking/gnc-gwen-gui.c @@ -295,7 +295,7 @@ gnc_GWEN_Gui_log_init(void) { log_gwen_gui = #ifdef USING_GWENHYWFAR_GTK2_GUI - Gtk2_Gui_new() + Gtk2_Gui_new() #else GWEN_Gui_new() #endif diff --git a/src/libqof/qof/qofsession.c b/src/libqof/qof/qofsession.c index 2faf4fa521..770aa87a63 100644 --- a/src/libqof/qof/qofsession.c +++ b/src/libqof/qof/qofsession.c @@ -1114,8 +1114,8 @@ qof_session_begin (QofSession *session, const char * book_id, /* Check to see if this session is already open */ if (session->book_id) { - if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) - qof_session_push_error (session, ERR_BACKEND_LOCKED, NULL); + if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) + qof_session_push_error (session, ERR_BACKEND_LOCKED, NULL); LEAVE("push error book is already open "); return; } @@ -1123,8 +1123,8 @@ qof_session_begin (QofSession *session, const char * book_id, /* seriously invalid */ if (!book_id) { - if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) - qof_session_push_error (session, ERR_BACKEND_BAD_URL, NULL); + if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) + qof_session_push_error (session, ERR_BACKEND_BAD_URL, NULL); LEAVE("push error missing book_id"); return; } @@ -1152,7 +1152,7 @@ qof_session_begin (QofSession *session, const char * book_id, g_free(session->book_id); session->book_id = NULL; if (ERR_BACKEND_NO_ERR == qof_session_get_error(session)) - qof_session_push_error (session, ERR_BACKEND_BAD_URL, NULL); + qof_session_push_error (session, ERR_BACKEND_BAD_URL, NULL); LEAVE (" BAD: no backend: sess=%p book-id=%s", session, book_id ? book_id : "(null)"); return; @@ -1404,11 +1404,11 @@ qof_session_save (QofSession *session, } if (!session->backend) { - if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) - { - msg = g_strdup_printf("failed to load backend"); - qof_session_push_error(session, ERR_BACKEND_NO_HANDLER, msg); - } + if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) + { + msg = g_strdup_printf("failed to load backend"); + qof_session_push_error(session, ERR_BACKEND_NO_HANDLER, msg); + } goto leave; } } @@ -1446,11 +1446,11 @@ qof_session_save (QofSession *session, } else { - if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) - { - msg = g_strdup_printf("failed to load backend"); - qof_session_push_error(session, ERR_BACKEND_NO_HANDLER, msg); - } + if (ERR_BACKEND_NO_ERR != qof_session_get_error(session)) + { + msg = g_strdup_printf("failed to load backend"); + qof_session_push_error(session, ERR_BACKEND_NO_HANDLER, msg); + } } LEAVE("error -- No backend!"); leave: