From cba3097cad7443810117bded371a2e3088a33d12 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 20 Mar 2007 17:23:58 +0000 Subject: ** Fixes bug #419524 2007-03-20 Matthew Barnes ** Fixes bug #419524 * Include instead of . * e-util/e-xml-utils.c (e_xml_get_child_by_name_by_lang_list): * mail/em-migrate.c (emm_setup_initial): * shell/e-component-registry.c (query_components): * shell/e-shell-settings-dialog.c (load_pages): * shell/e-shell-window-commands.c (command_quick_reference): * tools/killev.c (main): Use g_get_language_names() instead of gnome_i18n_get_language_list(). * e-util/e-util.c: Remove e_gettext(). * e-util/Makefile.am: Remove e-i18n.h. svn path=/trunk/; revision=33319 --- widgets/menus/gal-define-views-dialog.c | 6 +++--- widgets/menus/gal-define-views-model.c | 2 +- widgets/menus/gal-view-collection.c | 2 +- widgets/menus/gal-view-factory-etable.c | 2 +- widgets/menus/gal-view-instance-save-as-dialog.c | 6 +++--- widgets/menus/gal-view-instance.c | 2 +- widgets/menus/gal-view-menus.c | 2 +- widgets/menus/gal-view-new-dialog.c | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) (limited to 'widgets/menus') diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index cff8e77750..104e706b6d 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -26,7 +26,7 @@ #include #include "table/e-table-scrolled.h" -#include "e-util/e-i18n.h" +#include #include "e-util/e-util.h" #include "e-util/e-util-private.h" @@ -80,7 +80,7 @@ gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass) } /* ETable creation */ -#define SPEC "" \ +#define SPEC "" \ "" \ " " \ "" @@ -250,7 +250,7 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog) dialog->collection = NULL; - gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); + gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); g_free (filename); dialog->gui = gui; diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c index f526419398..b38dbbc4b2 100644 --- a/widgets/menus/gal-define-views-model.c +++ b/widgets/menus/gal-define-views-model.c @@ -27,7 +27,7 @@ #include #include -#include "e-util/e-i18n.h" +#include #include "e-util/e-util.h" #include "gal-define-views-model.h" diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 4cb1d569b7..848b789235 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -32,7 +32,7 @@ #include #include -#include "e-util/e-i18n.h" +#include #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "misc/e-unicode.h" diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c index bdeb1e1e71..309cf2d5cb 100644 --- a/widgets/menus/gal-view-factory-etable.c +++ b/widgets/menus/gal-view-factory-etable.c @@ -23,7 +23,7 @@ #include -#include "e-util/e-i18n.h" +#include #include "e-util/e-util.h" #include "gal-view-etable.h" diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index eb01386418..663097567f 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -26,7 +26,7 @@ #include #include "table/e-table-scrolled.h" -#include "e-util/e-i18n.h" +#include #include "e-util/e-util-private.h" #include "gal-define-views-model.h" @@ -197,7 +197,7 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog) dialog->instance = NULL; - gui = glade_xml_new_with_domain (filename , NULL, E_I18N_DOMAIN); + gui = glade_xml_new_with_domain (filename , NULL, GETTEXT_PACKAGE); g_free (filename); dialog->gui = gui; @@ -235,7 +235,7 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog) /* For use from libglade. */ /* ETable creation */ -#define SPEC "" \ +#define SPEC "" \ "" \ " " \ "" diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index bc92c30169..df84a38948 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -36,7 +36,7 @@ #include #include -#include "e-util/e-i18n.h" +#include #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "misc/e-unicode.h" diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index c440cb6c27..e6e7a93420 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index dee0f78dca..a256baccdb 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -26,7 +26,7 @@ #include #include "table/e-table-scrolled.h" -#include "e-util/e-i18n.h" +#include #include "e-util/e-util.h" #include "e-util/e-util-private.h" #include "misc/e-unicode.h" @@ -92,7 +92,7 @@ gal_view_new_dialog_init (GalViewNewDialog *dialog) "gal-view-new-dialog.glade", NULL); - gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); + gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); g_free (filename); dialog->gui = gui; -- cgit v1.2.3