diff options
Diffstat (limited to 'addressbook/gui/component/select-names')
3 files changed, 7 insertions, 8 deletions
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index deee27fca0..3b1c816ad6 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -44,6 +44,10 @@ INCLUDES = \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ + -DG_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DLIBGNOME_DISABLE_DEPRECATED \ + -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) lib_LTLIBRARIES = libeselectnames.la diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c index 3c18638298..33afa13b2e 100644 --- a/addressbook/gui/component/select-names/e-select-names-popup.c +++ b/addressbook/gui/component/select-names/e-select-names-popup.c @@ -35,7 +35,6 @@ #include <libgnomeui/gnome-app.h> #include <libgnomeui/gnome-app-helper.h> #include <libgnomeui/gnome-popup-menu.h> -#include <gal/widgets/e-unicode.h> #include <addressbook/backend/ebook/e-book-util.h> #include <addressbook/gui/contact-editor/e-contact-editor.h> @@ -215,15 +214,12 @@ static void set_uiinfo_label (GnomeUIInfo *uiinfo, const gchar *str) { GtkWidget *label; - gchar *label_txt; GList *item_children; - label_txt = e_utf8_to_locale_string (str); - item_children = gtk_container_children (GTK_CONTAINER (uiinfo->widget)); + item_children = gtk_container_get_children (GTK_CONTAINER (uiinfo->widget)); label = item_children->data; g_list_free (item_children); - gtk_label_set_text (GTK_LABEL (label), label_txt); - g_free (label_txt); + gtk_label_set_text (GTK_LABEL (label), str); } #define ARBITRARY_UIINFO_LIMIT 64 diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index bed94290ae..8b0531093b 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -43,7 +43,6 @@ #include <addressbook/backend/ebook/e-card-simple.h> #include "e-select-names-text-model.h" #include <gal/widgets/e-categories-master-list-option-menu.h> -#include <gal/widgets/e-unicode.h> #include <gal/e-text/e-entry.h> #include <e-util/e-categories-master-list-wombat.h> @@ -724,7 +723,7 @@ e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id, E child = g_new(ESelectNamesChild, 1); child->names = e_select_names; - child->title = e_utf8_from_locale_string(_(name)); + child->title = g_strdup (_(name)); child->text_model = (ESelectNamesTextModel *) e_select_names_text_model_new (source); e_select_names_text_model_set_separator (child->text_model, "\n"); |