diff options
-rw-r--r-- | addressbook/gui/component/select-names/e-select-names.c | 1 | ||||
-rw-r--r-- | calendar/gui/e-meeting-time-sel.c | 1 | ||||
-rw-r--r-- | shell/e-shell-folder-title-bar.c | 1 | ||||
-rw-r--r-- | widgets/misc/ChangeLog | 4 | ||||
-rw-r--r-- | widgets/misc/e-search-bar.c | 8 |
5 files changed, 5 insertions, 10 deletions
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index a189077c92..962a745abe 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -26,7 +26,6 @@ #include <gal/e-table/e-table-simple.h> #include <gal/e-table/e-table-without.h> -#include <gal/widgets/e-font.h> #include <gal/widgets/e-popup-menu.h> #include <addressbook/gui/widgets/e-addressbook-model.h> diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index b857814125..f472ed8028 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -54,7 +54,6 @@ #include <gal/widgets/e-canvas.h> #include <gal/widgets/e-canvas-utils.h> -#include <gal/widgets/e-font.h> #include <gal/e-table/e-cell-combo.h> #include <gal/e-table/e-cell-text.h> #include <gal/e-table/e-table-simple.h> diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c index 5c995f32d8..9871a9c1d1 100644 --- a/shell/e-shell-folder-title-bar.c +++ b/shell/e-shell-folder-title-bar.c @@ -35,7 +35,6 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gal/util/e-util.h> -#include <gal/widgets/e-font.h> #include "widgets/misc/e-clipped-label.h" #include "e-shell-constants.h" diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 9a79b5e70a..f1f3495126 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,7 @@ +2003-04-08 Mike Kestner <mkestner@ximian.com> + + * e-search-bar.c (set_option): kill an old e_utf8_gtk usage + 2003-04-06 Chris Toshok <toshok@ximian.com> * e-cell-percent.h: e_cell_percent_get_type returns GType, not diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 484fb12c42..dd73122f98 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -639,13 +639,7 @@ set_option (ESearchBar *esb, ESearchBarItem *items) char *str; str = string_without_underscores (_(items[i].text)); - if (_(items[i].text) == items[i].text) { - /* It may be english string, or utf8 rule name */ - item = e_utf8_gtk_menu_item_new_with_label (GTK_MENU (menu), str); - } else { - item = gtk_menu_item_new_with_label (str); - } - + item = gtk_menu_item_new_with_label (str); g_free (str); } else { item = gtk_menu_item_new (); |