evolution r35289 - in trunk/addressbook: . gui/widgets

[mcrha svn gnome org]

Author: mcrha
Date: Mon Mar 31 10:58:42 2008
New Revision: 35289
URL: http://svn.gnome.org/viewvc/evolution?rev=35289&view=rev

Log:
2008-03-31  Milan Crha  <mcrha redhat com>

	** Fix for bug #404241

	* gui/widgets/e-minicard.c: (get_email_location), (add_email_field):
	* gui/widgets/eab-contact-display.c: (get_email_location):
	Never return NULL, rather return "Other" as default.



Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/widgets/e-minicard.c
   trunk/addressbook/gui/widgets/eab-contact-display.c

Modified: trunk/addressbook/gui/widgets/e-minicard.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-minicard.c	(original)
+++ trunk/addressbook/gui/widgets/e-minicard.c	Mon Mar 31 10:58:42 2008
@@ -830,7 +830,7 @@
 			return _(common_location [i].pretty_name);
 	}
 
-	return NULL;
+	return _("Other Email");
 }
 
 static void
@@ -854,10 +854,7 @@
 		gboolean parser_check;
 
 		tmp = get_email_location ((EVCardAttribute *) l->data);
-		if (tmp)
-			name = g_strdup_printf ("%s:", tmp);
-		else
-			name = g_strdup ("");
+		name = g_strdup_printf ("%s:", tmp);
 
 		parser_check = eab_parse_qp_email ((const gchar *) le->data, &parsed_name, &email);
 		if (parser_check) {

Modified: trunk/addressbook/gui/widgets/eab-contact-display.c
==============================================================================
--- trunk/addressbook/gui/widgets/eab-contact-display.c	(original)
+++ trunk/addressbook/gui/widgets/eab-contact-display.c	Mon Mar 31 10:58:42 2008
@@ -525,7 +525,7 @@
 			return _(common_location [i].pretty_name);
 	}
 
-	return NULL;
+	return _("Other");
 }
 
 static void