soylent r108 - trunk/src

[treitter svn gnome org]

Author: treitter
Date: Thu Mar 27 05:56:55 2008
New Revision: 108
URL: http://svn.gnome.org/viewvc/soylent?rev=108&view=rev

Log:
finalize soylent-browser-person-view.c cleanup

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	Thu Mar 27 05:56:55 2008
@@ -2689,7 +2689,6 @@
   GtkFrame *frame_mail = NULL;
   guint context = 0;
   guint frames_visible = 0;
-  const EContactAddress *addr = NULL;
 
   g_return_val_if_fail (browser != NULL, retval);
   /* FIXME: uncomment once SoylentBrowser is a GObject:
@@ -2699,6 +2698,7 @@
   /* FIXME: uncomment once SoylentPerson is a GObject:
   g_return_val_if_fail (SOYLENT_IS_PERSON (PERSON), retval);
    */
+
   wtree = soylent_browser_get_widget_tree (browser);
   e_contact = soylent_person_get_e_contact (person);
   frame_mail = GTK_FRAME (glade_xml_get_widget (wtree, "frame_person_mail"));
@@ -2715,6 +2715,7 @@
       GtkFrame *frame_mail_cur = NULL;
       gchar *widget_str = NULL;
       const gchar *context_str = NULL;
+      EContactAddress *addr = NULL;
 
       context_str = CONTEXT_STRS[context];
 
@@ -2729,7 +2730,6 @@
       tb_street = gtk_text_view_get_buffer (tv_street);
       g_free (widget_str);
 
-      /* FIXME: factor out the commonality */
       entry_po = GTK_ENTRY (soylent_browser_get_widget (browser, "entry",
                                                         "mail", context_str,
                                                         "po"));
@@ -2748,39 +2748,37 @@
                                                              context_str,
                                                              "country"));
 
-      /* FIXME - this should use e_contact_get_const */
       addr = e_contact_get (e_contact, context + E_CONTACT_FIRST_ADDRESS_ID);
-
-      if (!addr)
-        {
-          gtk_widget_hide (GTK_WIDGET (frame_mail_cur));
-          continue;
-        }
-      else
+      if (addr)
         {
           gtk_widget_show (GTK_WIDGET (frame_mail_cur));
           frames_visible++;
-        }
 
-      /* FIXME: factor out the commonality */
-      text_buffer_set_text_block_handler
-                            (tb_street, addr->street,
-                             soylent_browser_person_entry_changed_e_contact_cb);
-      entry_set_text_block_handler
-                            (entry_po, addr->po,
-                             soylent_browser_person_entry_changed_e_contact_cb);
-      entry_set_text_block_handler
-                            (entry_code, addr->code,
-                             soylent_browser_person_entry_changed_e_contact_cb);
-      entry_set_text_block_handler
-                            (entry_locality, addr->locality,
-                             soylent_browser_person_entry_changed_e_contact_cb);
-      entry_set_text_block_handler
-                            (entry_region, addr->region,
-                             soylent_browser_person_entry_changed_e_contact_cb);
-      entry_set_text_block_handler
+          text_buffer_set_text_block_handler
+                          (tb_street, addr->street,
+                           soylent_browser_person_entry_changed_e_contact_cb);
+          entry_set_text_block_handler
+                          (entry_po, addr->po,
+                           soylent_browser_person_entry_changed_e_contact_cb);
+          entry_set_text_block_handler
+                          (entry_code, addr->code,
+                           soylent_browser_person_entry_changed_e_contact_cb);
+          entry_set_text_block_handler
+                          (entry_locality, addr->locality,
+                           soylent_browser_person_entry_changed_e_contact_cb);
+          entry_set_text_block_handler
+                          (entry_region, addr->region,
+                           soylent_browser_person_entry_changed_e_contact_cb);
+          entry_set_text_block_handler
                             (entry_country, addr->country,
                              soylent_browser_person_entry_changed_e_contact_cb);
+
+          e_contact_address_free (addr);
+        }
+      else
+        {
+          gtk_widget_hide (GTK_WIDGET (frame_mail_cur));
+        }
     }
 
   if (frames_visible > 0)
@@ -2794,7 +2792,7 @@
       gtk_widget_hide (GTK_WIDGET (frame_mail));
     }
 
-  /* FIXME: actually set this appropriately above */
+  /* if we get this far, this function succeeded */
   retval = TRUE;
 
   return retval;
@@ -2807,13 +2805,12 @@
 soylent_browser_person_view_name_update (SoylentBrowser *browser,
                                          SoylentPerson *person)
 {
+  gboolean retval = FALSE;
   GladeXML *wtree = NULL;
   EContact *e_contact = NULL;
   GtkEntry *entry_name = NULL;
   const gchar *name = NULL;
 
-gboolean retval = FALSE;
-
   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);
@@ -2837,7 +2834,7 @@
                  e_vcard_to_string (E_VCARD (e_contact), EVC_FORMAT_VCARD_30));
   */
 
-  /* FIXME: actually set this appropriately above */
+  /* if we get this far, this function succeeded */
   retval = TRUE;
 
   return retval;
@@ -2879,6 +2876,7 @@
   /* FIXME: uncomment once SoylentPerson is a GObject:
   g_return_val_if_fail (SOYLENT_IS_PERSON (PERSON), retval);
    */
+
   wtree = soylent_browser_get_widget_tree (browser);
   e_contact = soylent_person_get_e_contact (person);
   frame_phone = GTK_FRAME (glade_xml_get_widget (wtree, "frame_person_phone"));
@@ -2926,7 +2924,7 @@
       gtk_widget_show (GTK_WIDGET (fixed_phone));
     }
 
-  /* FIXME: actually set this appropriately above */
+  /* if we get this far, this function succeeded */
   retval = TRUE;
 
   return retval;
@@ -2965,6 +2963,7 @@
   /* FIXME: uncomment once SoylentPerson is a GObject:
   g_return_val_if_fail (SOYLENT_IS_PERSON (PERSON), retval);
    */
+
   wtree = soylent_browser_get_widget_tree (browser);
   e_contact = soylent_person_get_e_contact (person);
   frame_web = GTK_FRAME (glade_xml_get_widget (wtree, "frame_person_web"));
@@ -3009,7 +3008,7 @@
       gtk_widget_show (GTK_WIDGET (frame_web));
     }
 
-  /* FIXME: actually set this appropriately above */
+  /* if we get this far, this function succeeded */
   retval = TRUE;
 
   return retval;