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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/evolution-launch-composer.c | 2 | ||||
| -rw-r--r-- | tools/killev.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/evolution-launch-composer.c b/tools/evolution-launch-composer.c index ac152dcc20..4d1dd2f4ea 100644 --- a/tools/evolution-launch-composer.c +++ b/tools/evolution-launch-composer.c @@ -32,7 +32,7 @@ #include <bonobo/bonobo-main.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-ui-init.h> #include <libgnomevfs/gnome-vfs-ops.h> diff --git a/tools/killev.c b/tools/killev.c index 419b958587..dec1734c0d 100644 --- a/tools/killev.c +++ b/tools/killev.c @@ -31,7 +31,7 @@ #include <bonobo/bonobo-exception.h> #include <bonobo-activation/bonobo-activation.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> typedef struct { @@ -39,7 +39,7 @@ typedef struct { GPtrArray *names; } KillevComponent; -static GSList *languages; +static GSList *languages = NULL; static GHashTable *components; static gboolean @@ -186,7 +186,7 @@ add_matching_iid (const char *iid) int main (int argc, char **argv) { - const GList *l; + const gchar * const *language_names; bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -196,9 +196,9 @@ main (int argc, char **argv) GNOME_PROGRAM_STANDARD_PROPERTIES, NULL); - l = gnome_i18n_get_language_list("LC_MESSAGES"); - for (languages=NULL;l;l=l->next) - languages = g_slist_append(languages, l->data); + language_names = g_get_language_names (); + while (*language_names != NULL) + languages = g_slist_append (languages, *language_names++); components = g_hash_table_new (g_str_hash, g_str_equal); |