From 4bfaca31bd90e2e69f1339e231048cda9d89fa3d Mon Sep 17 00:00:00 2001 From: Takeshi Aihana Date: Tue, 28 Feb 2006 20:18:08 +0000 Subject: [PATCH] use correct text domain name. Closes bug #332833. 2006-02-28 Takeshi Aihana * gnome-da-capplet.c: (show_dialog), (main): use correct text domain name. Closes bug #332833. --- capplets/default-applications/ChangeLog | 5 +++++ capplets/default-applications/gnome-da-capplet.c | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index 3128b51d4..764ecd7a3 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,8 @@ +2006-02-28 Takeshi Aihana + + * gnome-da-capplet.c: (show_dialog), (main): use correct text domain + name. Closes bug #332833. + 2006-02-27 Glynn Foster * gnome-default-applications.xml.in: Fix typos. diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c index 481ec7be1..e5dd2f0ff 100644 --- a/capplets/default-applications/gnome-da-capplet.c +++ b/capplets/default-applications/gnome-da-capplet.c @@ -19,7 +19,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include @@ -699,10 +699,10 @@ show_dialog (GnomeDACapplet *capplet) GtkIconTheme *theme; if (g_file_test (GLADEDIR "/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) { - capplet->xml = glade_xml_new (GLADEDIR "/gnome-default-applications-properties.glade", NULL, PACKAGE); + capplet->xml = glade_xml_new (GLADEDIR "/gnome-default-applications-properties.glade", NULL, NULL); } else { - capplet->xml = glade_xml_new ("./gnome-default-applications-properties.glade", NULL, PACKAGE); + capplet->xml = glade_xml_new ("./gnome-default-applications-properties.glade", NULL, NULL); } if (capplet->xml == NULL) { @@ -807,15 +807,17 @@ main (int argc, char **argv) capplet = g_new0 (GnomeDACapplet, 1); +#ifdef ENABLE_NLS + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); +#endif + gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, GNOME_PARAM_NONE); glade_init (); - bindtextdomain (PACKAGE, GNOMELOCALEDIR); - bind_textdomain_codeset (PACKAGE, "UTF-8"); - textdomain (PACKAGE); - capplet->gconf = gconf_client_get_default (); gconf_client_add_dir (capplet->gconf, "/desktop/gnome/applications/browser", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);