diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-03-21 01:23:58 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-03-21 01:23:58 +0800 |
| commit | cba3097cad7443810117bded371a2e3088a33d12 (patch) | |
| tree | b4bf9ba6b6c9b5433c8ac2614694d7bf76d87ff0 /shell/e-component-registry.c | |
| parent | 2313e47dab3e8151743138892277b08cf78034cc (diff) | |
| download | gsoc2013-evolution-cba3097cad7443810117bded371a2e3088a33d12.tar.gz gsoc2013-evolution-cba3097cad7443810117bded371a2e3088a33d12.tar.zst gsoc2013-evolution-cba3097cad7443810117bded371a2e3088a33d12.zip | |
** Fixes bug #419524
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #419524
* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
* 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
Diffstat (limited to 'shell/e-component-registry.c')
| -rw-r--r-- | shell/e-component-registry.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 12ccd82c5a..d4a9411490 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -28,7 +28,7 @@ #include <e-util/e-icon-factory.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-exception.h> @@ -146,8 +146,9 @@ static void query_components (EComponentRegistry *registry) { Bonobo_ServerInfoList *info_list; + const gchar * const *language_names; CORBA_Environment ev; - GSList *language_list; + GSList *languages = NULL; const GList *l; char *query; int i; @@ -170,9 +171,9 @@ query_components (EComponentRegistry *registry) return; } - l = gnome_i18n_get_language_list("LC_MESSAGES"); - for (language_list=NULL;l;l=l->next) - language_list = g_slist_append(language_list, l->data); + language_names = g_get_language_names (); + while (*language_names != NULL) + languages = g_slist_append (languages, *language_names++); for (i = 0; i < info_list->_length; i++) { const char *id; @@ -200,13 +201,13 @@ query_components (EComponentRegistry *registry) continue; } - label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", language_list); + label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", languages); - tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", language_list); + tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", languages); - menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", language_list); + menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", languages); - menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", language_list); + menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", languages); alias = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_alias", NULL); @@ -235,7 +236,7 @@ query_components (EComponentRegistry *registry) g_object_unref (menuicon); bonobo_object_release_unref(iface, NULL); } - g_slist_free(language_list); + g_slist_free(languages); CORBA_free (info_list); CORBA_exception_free (&ev); |