AUDIT: r15548 - gnucash/trunk/src/import-export/hbci - Really clean up enter/leave pairs. Avoid duplicated sanity checks.

[Christian Stimming]

Author: cstim
Date: 2007-02-10 05:43:38 -0500 (Sat, 10 Feb 2007)
New Revision: 15548
Trac: http://svn.gnucash.org/trac/changeset/15548

Modified:
   gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c
Log:
Really clean up enter/leave pairs. Avoid duplicated sanity checks.
BP

Modified: gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c	2007-02-10 02:31:35 UTC (rev 15547)
+++ gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c	2007-02-10 10:43:38 UTC (rev 15548)
@@ -330,16 +330,22 @@
   const gchar    *account_name;
 
   ENTER("main window %p", window);
-  if (!GNC_IS_MAIN_WINDOW(window)) { LEAVE(""); }
-  g_return_val_if_fail (GNC_IS_MAIN_WINDOW (window), NULL);
+  if (!GNC_IS_MAIN_WINDOW(window)) {
+    LEAVE("no main_window");
+    return NULL;
+  }
 
   /* Ensure we are called from a register page. */
   page = gnc_main_window_get_current_page(window);
-  if (!GNC_IS_PLUGIN_PAGE(page)) { LEAVE(""); }
-  g_return_val_if_fail (GNC_IS_PLUGIN_PAGE (page), NULL);
+  if (!GNC_IS_PLUGIN_PAGE(page)) {
+    LEAVE("no plugin_page");
+    return NULL;
+  }
   page_name = gnc_plugin_page_get_plugin_name(page);
-  if (!g_return_val_if_fail(page_name)) { LEAVE(""); }
-  g_return_val_if_fail (page_name, NULL);
+  if (!page_name) {
+    LEAVE("no page_name of plugin_page");
+    return NULL;
+  }
 
   if (safe_strcmp(page_name, GNC_PLUGIN_PAGE_REGISTER_NAME) == 0) {
     DEBUG("register page");
@@ -389,11 +395,17 @@
   const gchar    *page_name;
 
   ENTER("main window %p, page %p", window, page);
-  if (!GNC_IS_PLUGIN_PAGE(page)) { LEAVE(""); }
-  g_return_if_fail (GNC_IS_PLUGIN_PAGE (page));
+  if (!GNC_IS_PLUGIN_PAGE(page)) { 
+    LEAVE("no plugin_page");
+    return;
+  }
+
   page_name = gnc_plugin_page_get_plugin_name(page);
-  if (!page_name) { LEAVE(""); }
-  g_return_if_fail (page_name);
+  if (!page_name) {
+    LEAVE("no page_name of plugin_page");
+    return;
+  }
+
   if (safe_strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0) {
     DEBUG("account tree page, adding signal");
     g_signal_connect (G_OBJECT(page),
@@ -416,11 +428,16 @@
   Account        *account;
 
   ENTER("main window %p, page %p", window, page);
-  if (!GNC_IS_MAIN_WINDOW (window)) { LEAVE(""); }
-  g_return_if_fail (GNC_IS_MAIN_WINDOW (window));
+  if (!GNC_IS_MAIN_WINDOW (window)) {
+    LEAVE("no main_window");
+    return;
+  }
+
   action_group = gnc_main_window_get_action_group(window,PLUGIN_ACTIONS_NAME);
-  if (!GTK_IS_ACTION_GROUP (action_group)) { LEAVE(""); }
-  g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
+  if (!GTK_IS_ACTION_GROUP (action_group)) {
+    LEAVE("no action_group");
+    return;
+  }
 
   /* Reset everything to known state */
   gnc_plugin_update_actions(action_group, need_account_actions,