soylent r179 - trunk/src

[treitter svn gnome org]

Author: treitter
Date: Mon Jun 23 05:45:26 2008
New Revision: 179
URL: http://svn.gnome.org/viewvc/soylent?rev=179&view=rev

Log:
cut SoylentBrowser.pending_edits entirely (it's obsolete)

Modified:
   trunk/src/soylent-browser-person-view.c
   trunk/src/soylent-browser.c
   trunk/src/soylent-browser.h

Modified: trunk/src/soylent-browser-person-view.c
==============================================================================
--- trunk/src/soylent-browser-person-view.c	(original)
+++ trunk/src/soylent-browser-person-view.c	Mon Jun 23 05:45:26 2008
@@ -999,102 +999,6 @@
   return retval;
 }
 
-#if 0
-/* Save unsaved changes to the person's details
- *
- * Return TRUE for success, FALSE for any failure. */
-static gboolean
-soylent_browser_person_view_save_changes (GtkWidget *widget, gpointer user_data)
-{
-  gboolean retval = FALSE;
-  SoylentBrowser *browser = NULL;
-  GHashTable *edits_pending = NULL;
-
-  g_return_val_if_fail (user_data, retval);
-  /* FIXME: uncomment once SoylentBrowser is a GObject:
-  g_return_val_if_fail (SOYLENT_IS_BROWSER (user_data), retval);
-   */
-
-  browser = (SoylentBrowser*) user_data;
-
-  edits_pending = soylent_browser_get_edits_pending (browser);
-  if (edits_pending)
-    {
-      EContact *e_contact = NULL;
-
-      g_hash_table_foreach_remove
-              (edits_pending,
-               (GHRFunc) soylent_browser_person_apply_edits_from_widgets_switch,
-               browser);
-
-      e_contact = soylent_browser_get_selected_person_e_contact (browser);
-      if (e_contact)
-        {
-          EBook *e_book = NULL;
-
-          e_book = soylent_browser_get_e_book (browser);
-          if (e_book)
-            {
-              EBookView *e_book_view = NULL;
-
-              e_book_view = soylent_browser_get_e_book_view (browser);
-              if (e_book_view)
-                {
-                  SoylentPerson *person = NULL;
-
-                  person = soylent_browser_get_person_from_e_contact
-                                                                (browser,
-                                                                  e_contact);
-                  if (person)
-                    {
-                      gboolean commit_retval = FALSE;
-                      GError *error = NULL;
-
-                      commit_retval = e_book_commit_contact (e_book,
-                                                              e_contact,
-                                                              &error);
-                      if (commit_retval)
-                        {
-                          retval = TRUE;
-                        }
-                      else
-                        {
-                          g_warning ("Could not commit changes to address "
-                                     "book: %s",
-                                     error ? error->message : "no error given");
-                          g_clear_error (&error);
-                        }
-                    }
-                  else
-                    {
-                      g_warning ("failed to get SoylentPerson from EContact");
-                    }
-                }
-              else
-                {
-                  g_critical ("failed to get the EBookView for the "
-                              "SoylentBrowser");
-                }
-            }
-          else
-            {
-              g_critical ("failed to get EBook for the SoylentBrowser");
-            }
-        }
-      else
-        {
-          g_warning ("failed to get EContact for the person");
-        }
-    }
-  else
-    {
-      g_critical ("failed to get the browser's pending edits hash");
-    }
-
-  return retval;
-}
-#endif
-
 /* Add name field changes to selected EContact (but do not commit) */
 static gboolean
 soylent_browser_person_view_save_changes_prep_name (SoylentBrowser *browser,

Modified: trunk/src/soylent-browser.c
==============================================================================
--- trunk/src/soylent-browser.c	(original)
+++ trunk/src/soylent-browser.c	Mon Jun 23 05:45:26 2008
@@ -40,7 +40,6 @@
   EBook *book;
   EBookView *book_view;
   GHashTable *people;
-  GHashTable *pending_edits;
   GladeXML *main_window;
   soylent_browser_people_view_mode view_mode;
   EmpathyContactManager *live_manager;
@@ -126,77 +125,67 @@
               * we need to free these eventually - just not during the main
               * lifetime of the app
               */
-              browser->pending_edits = g_hash_table_new (g_str_hash,
-                                                         g_str_equal);
-              if (browser->pending_edits)
+              gboolean set_mode_retval = FALSE;
+
+              browser->live_idle = empathy_idle_new ();
+              if (browser->live_idle)
+                {
+                  /* XXX: some of these should be user-configurable */
+                  empathy_idle_set_auto_away (browser->live_idle, TRUE);
+                  empathy_idle_set_presence (browser->live_idle,
+                                            MC_PRESENCE_AVAILABLE, "");
+                }
+              else
                 {
-                  gboolean set_mode_retval = FALSE;
+                  /* non-fatal */
+                  g_warning ("unable to initialize Empathy presence "
+                              "handler");
+                }
 
-                  browser->live_idle = empathy_idle_new ();
-                  if (browser->live_idle)
-                    {
-                      /* XXX: some of these should be user-configurable */
-                      empathy_idle_set_auto_away (browser->live_idle, TRUE);
-                      empathy_idle_set_presence (browser->live_idle,
-                                                MC_PRESENCE_AVAILABLE, "");
-                    }
-                  else
-                    {
-                      /* non-fatal */
-                      g_warning ("unable to initialize Empathy presence "
-                                 "handler");
-                    }
+              set_mode_retval = soylent_browser_view_set_mode (browser,
+                                                               view_mode);
+              if (set_mode_retval)
+                {
+                  gboolean signal_setup_retval = FALSE;
 
-                  set_mode_retval = soylent_browser_view_set_mode (browser,
-                                                                   view_mode);
-                  if (set_mode_retval)
+                  signal_setup_retval = soylent_browser_widget_signals_setup
+                                                                      (browser);
+                  if (signal_setup_retval)
                     {
-                      gboolean signal_setup_retval = FALSE;
+                      gboolean widget_setup_retval = FALSE;
 
-                      signal_setup_retval = soylent_browser_widget_signals_setup
+                      widget_setup_retval = soylent_browser_widget_setup
                                                                       (browser);
-                      if (signal_setup_retval)
+                      if (widget_setup_retval)
                         {
-                          gboolean widget_setup_retval = FALSE;
+                          gboolean ebook_setup_retval = FALSE;
 
-                          widget_setup_retval = soylent_browser_widget_setup
+                          ebook_setup_retval = soylent_browser_eds_ebook_setup
                                                                       (browser);
-                          if (widget_setup_retval)
+                          if (ebook_setup_retval)
                             {
-                              gboolean ebook_setup_retval = FALSE;
-
-                              ebook_setup_retval =
-                                                soylent_browser_eds_ebook_setup
-                                                                      (browser);
-                              if (ebook_setup_retval)
-                                {
-                                  /* success */
-                                  retval = browser;
-                                }
-                              else
-                                {
-                                  g_critical ("failed to set up EBook (address "
-                                              "book)");
-                                }
+                              /* success */
+                              retval = browser;
                             }
                           else
                             {
-                              g_critical ("failed to set up major widgets");
+                              g_critical ("failed to set up EBook (address "
+                                          "book)");
                             }
                         }
                       else
                         {
-                          g_critical ("failed to set up major GObject signals");
+                          g_critical ("failed to set up major widgets");
                         }
                     }
                   else
                     {
-                      g_critical ("failed to set the browser view mode");
+                      g_critical ("failed to set up major GObject signals");
                     }
                 }
               else
                 {
-                  g_critical ("failed to allocate pending edits hash table");
+                  g_critical ("failed to set the browser view mode");
                 }
             }
           else
@@ -229,7 +218,6 @@
    *  - because they were never ref'd in the first place? */
   /*
   g_object_unref (browser->people);
-  g_object_unref (browser->pending_edits);
   */
   /*
   FIXME: actually do this
@@ -264,17 +252,6 @@
   return browser->book_view;
 }
 
-GHashTable*
-soylent_browser_get_edits_pending (SoylentBrowser *browser)
-{
-  g_return_val_if_fail (browser, NULL);
-  /* FIXME: uncomment once SoylentBrowser is a GObject:
-  g_return_val_if_fail (SOYLENT_IS_BROWSER (browser), NULL);
-   */
-
-  return browser->pending_edits;
-}
-
 guint
 soylent_browser_get_icon_height_max (SoylentBrowser *browser)
 {

Modified: trunk/src/soylent-browser.h
==============================================================================
--- trunk/src/soylent-browser.h	(original)
+++ trunk/src/soylent-browser.h	Mon Jun 23 05:45:26 2008
@@ -99,7 +99,6 @@
 
 EBook* soylent_browser_get_e_book (SoylentBrowser *browser);
 EBookView* soylent_browser_get_e_book_view (SoylentBrowser *browser);
-GHashTable* soylent_browser_get_edits_pending (SoylentBrowser *browser);
 guint soylent_browser_get_icon_height_max (SoylentBrowser *browser);
 guint soylent_browser_get_icon_width_max (SoylentBrowser *browser);
 GHashTable* soylent_browser_get_people (SoylentBrowser *browser);