From 6d8bd4aadd88a15550a2f288054f84569fdb4e3f Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Mon, 14 May 2007 03:26:41 +0000 Subject: Fix for bug #404239 #358250 svn path=/trunk/; revision=33524 --- addressbook/ChangeLog | 13 +++++++++++++ addressbook/gui/widgets/e-addressbook-view.etspec | 2 +- addressbook/gui/widgets/e-minicard.c | 3 ++- addressbook/gui/widgets/eab-contact-display.c | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index caad300835..28ce9431c6 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,16 @@ +2007-05-14 Srinivasa Ragavan + + ** Fix for bug #404239 from Øystein Gisnås + + * /addressbook/gui/widgets/e-minicard.c: + +2007-05-14 Srinivasa Ragavan + + ** Fix for bug #358250 from Javier F. Serrador + + * gui/widgets/e-addressbook-view.etspec: + * gui/widgets/eab-contact-display.c: (render_contact): + 2007-05-12 Matthew Barnes ** Fixes part of bug #337616 diff --git a/addressbook/gui/widgets/e-addressbook-view.etspec b/addressbook/gui/widgets/e-addressbook-view.etspec index c982fdcc29..1f15103664 100644 --- a/addressbook/gui/widgets/e-addressbook-view.etspec +++ b/addressbook/gui/widgets/e-addressbook-view.etspec @@ -36,7 +36,7 @@ different and established translation for this in your language. --> - + diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 0f8c8d7ad2..f7852ca86d 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -847,7 +847,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i for (l=email_list, le=emails; l!=NULL && count < limit && le!=NULL; l = l->next, le=le->next) { - name = get_email_location ((EVCardAttribute *) l->data); + name = g_strdup_printf("%s:", get_email_location ((EVCardAttribute *) l->data)); string = e_text_to_html (le->data, 0); new_item = e_minicard_label_new(group); @@ -877,6 +877,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i e_minicard->fields = g_list_append( e_minicard->fields, minicard_field); e_canvas_item_move_absolute(new_item, 2, e_minicard->height); count++; + g_free(name); g_free(string); } g_list_free (emails); diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 26a5fc01e2..f5bc9a0f71 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -563,7 +563,7 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact) g_string_assign (accum, ""); - accum_attribute (accum, contact, _("Organization"), E_CONTACT_ORG, NULL, 0); + accum_attribute (accum, contact, _("Company"), E_CONTACT_ORG, NULL, 0); accum_attribute (accum, contact, _("Department"), E_CONTACT_ORG_UNIT, NULL, 0); accum_attribute (accum, contact, _("Profession"), E_CONTACT_ROLE, NULL, 0); accum_attribute (accum, contact, _("Position"), E_CONTACT_TITLE, NULL, 0); -- cgit v1.2.3