aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-03-31 17:58:42 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-03-31 17:58:42 +0800
commit0e3447e1da95111e3b12f3b3109e4f3e87f809e6 (patch)
treea30be4bfcf2fea713601a1d01760158e814b1707 /addressbook/gui
parent14517736a2fb97130b3dc4b7c3bb4264b4baefc0 (diff)
downloadgsoc2013-evolution-0e3447e1da95111e3b12f3b3109e4f3e87f809e6.tar
gsoc2013-evolution-0e3447e1da95111e3b12f3b3109e4f3e87f809e6.tar.gz
gsoc2013-evolution-0e3447e1da95111e3b12f3b3109e4f3e87f809e6.tar.bz2
gsoc2013-evolution-0e3447e1da95111e3b12f3b3109e4f3e87f809e6.tar.lz
gsoc2013-evolution-0e3447e1da95111e3b12f3b3109e4f3e87f809e6.tar.xz
gsoc2013-evolution-0e3447e1da95111e3b12f3b3109e4f3e87f809e6.tar.zst
gsoc2013-evolution-0e3447e1da95111e3b12f3b3109e4f3e87f809e6.zip
** Fix for bug #404241
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. svn path=/trunk/; revision=35289
Diffstat (limited to 'addressbook/gui')
-rw-r--r--addressbook/gui/widgets/e-minicard.c7
-rw-r--r--addressbook/gui/widgets/eab-contact-display.c2
2 files changed, 3 insertions, 6 deletions
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