diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-06-18 13:28:09 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-06-18 13:28:09 +0800 |
| commit | 70b5e473c89cb4397ebaa365bcf39e60abce49fe (patch) | |
| tree | ce4ff140c2868a5e65ae2114b3e963835ec7b57c /addressbook | |
| parent | 68b50c270671de5d3e854ff949efcd66f4c2f745 (diff) | |
| download | gsoc2013-evolution-70b5e473c89cb4397ebaa365bcf39e60abce49fe.tar.gz gsoc2013-evolution-70b5e473c89cb4397ebaa365bcf39e60abce49fe.tar.zst gsoc2013-evolution-70b5e473c89cb4397ebaa365bcf39e60abce49fe.zip | |
Fix for bug #448223 from Gilles Dartiguelongue
svn path=/trunk/; revision=33700
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 29 |
2 files changed, 8 insertions, 27 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 932c016cdd..9d9d0bd9d7 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,11 @@ 2007-06-18 Srinivasa Ragavan <sragavan@novell.com> + ** Fix for bug #448223 from Gilles Dartiguelongue + + * gui/widgets/e-addressbook-view.c: (generate_viewoption_menu): + +2007-06-18 Srinivasa Ragavan <sragavan@novell.com> + ** Fix for bug #445812 from Gilles Dartiguelongue * gui/widgets/eab-contact-display.c: diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 3174e5f21f..33042013c3 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -43,6 +43,7 @@ #include "a11y/addressbook/ea-addressbook.h" #include "e-util/e-print.h" +#include "e-util/e-util.h" #include "libedataserver/e-sexp.h" #include <libedataserver/e-categories.h> @@ -1586,32 +1587,6 @@ compare_subitems (const void *a, const void *b) return ret; } -static char * -string_without_underscores (const char *s) -{ - char *new_string; - const char *sp; - char *dp; - - new_string = g_malloc (strlen (s) + 1); - - dp = new_string; - for (sp = s; *sp != '\0'; sp ++) { - if (*sp != '_') { - *dp = *sp; - dp ++; - } else if (sp[1] == '_') { - /* Translate "__" in "_". */ - *dp = '_'; - dp ++; - sp ++; - } - } - *dp = 0; - - return new_string; -} - static GtkWidget * generate_viewoption_menu (EABSearchBarItem *subitems) { @@ -1623,7 +1598,7 @@ generate_viewoption_menu (EABSearchBarItem *subitems) for (i = 0; subitems[i].search.id != -1; ++i) { if (subitems[i].search.text) { char *str = NULL; - str = string_without_underscores (subitems[i].search.text); + str = e_str_without_underscores (subitems[i].search.text); menu_item = gtk_image_menu_item_new_with_label (str); /* if (subitems[i].image) gtk_image_menu_item_set_image (menu_item, e_icon_factory_get_image (subitems[i].image, E_ICON_SIZE_MENU)); */ |