soylent r94 - trunk/src

[treitter svn gnome org]

Author: treitter
Date: Sat Mar  8 06:24:20 2008
New Revision: 94
URL: http://svn.gnome.org/viewvc/soylent?rev=94&view=rev

Log:
Use the same style for handling the EVCard in detail_add_person_add_attr() as in detail_add_person_add_mail_attrs()

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	Sat Mar  8 06:24:20 2008
@@ -1640,7 +1640,7 @@
                             const gchar *param_val)
 {
   gboolean retval = FALSE;
-  EVCard *vcard = NULL;
+  EVCard *e_vcard = NULL;
   EVCardAttribute *attr = NULL;
   GladeXML *wtree = NULL;
 
@@ -1652,37 +1652,41 @@
 
   wtree = soylent_browser_get_widget_tree (browser);
 
-  attr = e_vcard_attribute_new (NULL, attr_name);
-  if (attr)
+  e_vcard = E_VCARD (soylent_browser_get_selected_person_e_contact (browser));
+  if (e_vcard && E_IS_VCARD (e_vcard))
     {
-      GtkEntry *entry_add = NULL;
-      const gchar *attr_val = NULL;
-
-      entry_add = GTK_ENTRY (glade_xml_get_widget (wtree, "entry_detail_add"));
-      attr_val = gtk_entry_get_text (entry_add);      
-
-      if (param_val)
+      attr = e_vcard_attribute_new (NULL, attr_name);
+      if (attr)
         {
-          EVCardAttributeParam *param = NULL;
+          GtkEntry *entry_add = NULL;
+          const gchar *attr_val = NULL;
 
-          param = e_vcard_attribute_param_new (EVC_TYPE);
-          e_vcard_attribute_add_param_with_value (attr, param, param_val);
+          entry_add = GTK_ENTRY (glade_xml_get_widget (wtree,
+                                                       "entry_detail_add"));
+          attr_val = gtk_entry_get_text (entry_add);      
 
-          /* Mimicking the way Evolution sets up phone VCard entries (for better
-           * or worse...) */
-          if (g_str_equal (attr_name, EVC_TEL)
-              && (g_str_equal (param_val, "HOME")
-                  || g_str_equal (param_val, "WORK")))
+          if (param_val)
             {
+              EVCardAttributeParam *param = NULL;
+
               param = e_vcard_attribute_param_new (EVC_TYPE);
-              e_vcard_attribute_add_param_with_value (attr, param, "VOICE");
+              e_vcard_attribute_add_param_with_value (attr, param, param_val);
+
+              /* Mimicking the way Evolution sets up phone VCard entries (for
+               * better or worse...) */
+              if (g_str_equal (attr_name, EVC_TEL)
+                  && (g_str_equal (param_val, "HOME")
+                      || g_str_equal (param_val, "WORK")))
+                {
+                  param = e_vcard_attribute_param_new (EVC_TYPE);
+                  e_vcard_attribute_add_param_with_value (attr, param, "VOICE");
+                }
             }
-        }
 
-      vcard = E_VCARD (soylent_browser_get_selected_person_e_contact (browser));
-      e_vcard_add_attribute_with_value (vcard, attr, attr_val);
+          e_vcard_add_attribute_with_value (e_vcard, attr, attr_val);
 
-      retval = TRUE;
+          retval = TRUE;
+        }
     }
 
   return retval;