soylent r174 - trunk/src

[treitter svn gnome org]

Author: treitter
Date: Mon Jun 23 03:40:14 2008
New Revision: 174
URL: http://svn.gnome.org/viewvc/soylent?rev=174&view=rev

Log:
make the signature of soylent_browser_person_view_save_changes_prep_email() sane

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

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 03:40:14 2008
@@ -1258,28 +1258,22 @@
 
 /* Add email field changes to selected EContact (but do not commit) */
 static gboolean
-soylent_browser_person_view_save_changes_prep_email (GtkWidget *widget,
-                                                     gpointer user_data)
+soylent_browser_person_view_save_changes_prep_email (SoylentBrowser *browser,
+                                                     EContact *e_contact)
 {
   gboolean retval = FALSE;
-  SoylentBrowser *browser = NULL;
   GladeXML *wtree = NULL;
   EContactField e_contact_field = E_CONTACT_FIELD_FIRST - 1;
-  EContact *e_contact = NULL;
   gchar *contents_new = NULL;
   guint email_num = 1;
 
-  g_return_val_if_fail (user_data, retval);
+  g_return_val_if_fail (browser, retval);
   /* FIXME: uncomment once SoylentBrowser is a GObject:
-  g_return_val_if_fail (SOYLENT_IS_BROWSER (user_data), retval);
+  g_return_val_if_fail (SOYLENT_IS_BROWSER (browser), retval);
    */
 
-  browser = (SoylentBrowser*) user_data;
   wtree = soylent_browser_get_widget_tree (browser);
 
-  /* TODO: make this one of the parameters instead */
-  e_contact = soylent_browser_get_selected_person_e_contact (browser);
-
   /* invert usual logic to simplify code below */
   retval = TRUE;
 
@@ -1452,7 +1446,7 @@
     g_free (contents_new);
   }
 
-  soylent_browser_person_view_save_changes_prep_email (NULL, browser);
+  soylent_browser_person_view_save_changes_prep_email (browser, e_contact);
 
   /* Prep the phone numbers for saving */
   soylent_browser_person_view_save_changes_prep_list