soylent r79 - trunk/src

[treitter svn gnome org]

Author: treitter
Date: Wed Feb 13 06:46:21 2008
New Revision: 79
URL: http://svn.gnome.org/viewvc/soylent?rev=79&view=rev

Log:
Cut out some (now-unnecessary) shell signal setup functions

Modified:
   trunk/src/soylent-browser.c

Modified: trunk/src/soylent-browser.c
==============================================================================
--- trunk/src/soylent-browser.c	(original)
+++ trunk/src/soylent-browser.c	Wed Feb 13 06:46:21 2008
@@ -78,7 +78,6 @@
 static gboolean soylent_browser_widget_signals_setup (SoylentBrowser *browser);
 static gboolean soylent_browser_person_info_mail_signals_setup
                                                       (SoylentBrowser *browser);
-static gboolean soylent_browser_signals_setup (SoylentBrowser *browser);
 
 /* Instantiate the main SoylentBrowser */
 SoylentBrowser*
@@ -160,7 +159,7 @@
                     {
                       gboolean signal_setup_retval = FALSE;
 
-                      signal_setup_retval = soylent_browser_signals_setup
+                      signal_setup_retval = soylent_browser_widget_signals_setup
                                                                       (browser);
                       if (signal_setup_retval)
                         {
@@ -1836,6 +1835,19 @@
         }
     }
 
+  {
+    gboolean mail_signals_retval = FALSE;
+
+    /* TODO: push the contents of this function into the massive struct above */
+    mail_signals_retval =
+                      soylent_browser_person_info_mail_signals_setup (browser);
+
+    if (mail_signals_retval == FALSE)
+      {
+        retval = FALSE;
+      }
+  }
+
   return retval;
 }
 
@@ -1925,32 +1937,3 @@
 
   return retval;
 }
-
-/* Hook up handlers for all the people-related widgets (overview)
- *
- * Return TRUE for complete success, FALSE otherwise. */
-static gboolean
-soylent_browser_signals_setup (SoylentBrowser *browser)
-{
-  gboolean retval = FALSE;
-  gboolean widget_signals_retval = FALSE;
-  GladeXML *wtree = NULL;
-
-  g_return_val_if_fail (browser != NULL, retval);
-  /* FIXME: uncomment once SoylentBrowser is a GObject:
-  g_return_val_if_fail (SOYLENT_IS_BROWSER (browser), retval);
-   */
-
-  wtree = browser->main_window;
-
-  /* FIXME: check this return value, etc. */
-  widget_signals_retval = soylent_browser_widget_signals_setup (browser);
-
-  /* FIXME: simplify these like widget_signals_setup, above */
-  soylent_browser_person_info_mail_signals_setup  (browser);
-
-  /* FIXME: only set this if everything above succeeds */
-  retval = TRUE;
-
-  return retval;
-}