aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/widgets/e-minicard.c7
-rw-r--r--addressbook/gui/widgets/eab-contact-display.c2
3 files changed, 11 insertions, 6 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 3e9a670d63..61e25d03e1 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
2008-03-27 Milan Crha <mcrha@redhat.com>
** Fix for bug #438613
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index cf1dc03476..f32674d55e 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -830,7 +830,7 @@ get_email_location (EVCardAttribute *attr)
return _(common_location [i].pretty_name);
}
- return NULL;
+ return _("Other Email");
}
static void
@@ -854,10 +854,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i
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) {
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index a93f86e2ea..c1e0cf98da 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -525,7 +525,7 @@ get_email_location (EVCardAttribute *attr)
return _(common_location [i].pretty_name);
}
- return NULL;
+ return _("Other");
}
static void