[GNUnet-SVN] r2835 - GNUnet/src/conf

[grothoff]

Author: grothoff
Date: 2006-05-16 20:24:45 -0700 (Tue, 16 May 2006)
New Revision: 2835

Modified:
   GNUnet/src/conf/gconf.c
   GNUnet/src/conf/glade_support.c
   GNUnet/src/conf/gnunet-setup.c
   GNUnet/src/conf/wizard_gtk.c
Log:
i18n

Modified: GNUnet/src/conf/gconf.c
===================================================================
--- GNUnet/src/conf/gconf.c     2006-05-17 02:32:32 UTC (rev 2834)
+++ GNUnet/src/conf/gconf.c     2006-05-17 03:24:45 UTC (rev 2835)
@@ -1619,11 +1619,11 @@
   char * filename;
 
   setLibrary(lib);
-  /* GTK stuffs */
+  g_thread_init(NULL);
   gtk_init(&argc, &argv);
-  bind_textdomain_codeset(PACKAGE, "UTF-8");
-  gtk_set_locale();
-
+#if ENABLE_NLS
+  bind_textdomain_codeset(PACKAGE, "UTF-8"); /* for gtk */
+#endif
 #ifdef WINDOWS
   FreeConsole();
 #endif

Modified: GNUnet/src/conf/glade_support.c
===================================================================
--- GNUnet/src/conf/glade_support.c     2006-05-17 02:32:32 UTC (rev 2834)
+++ GNUnet/src/conf/glade_support.c     2006-05-17 03:24:45 UTC (rev 2835)
@@ -87,8 +87,8 @@
 
   gladeFile = get_glade_filename();
   ret = glade_xml_new(gladeFile,
-                         dialog_name,
-                         PACKAGE_NAME);
+                     dialog_name,
+                     PACKAGE_NAME);
   if (ret == NULL)
     errexit(_("Failed to open `%s'.\n"),
            gladeFile);  

Modified: GNUnet/src/conf/gnunet-setup.c
===================================================================
--- GNUnet/src/conf/gnunet-setup.c      2006-05-17 02:32:32 UTC (rev 2834)
+++ GNUnet/src/conf/gnunet-setup.c      2006-05-17 03:24:45 UTC (rev 2835)
@@ -217,7 +217,6 @@
     return -1;
 
   done = NO;
-
   operation = getConfigurationString("GNUNET-SETUP", "OPERATION");
   if (operation == NULL) {
     operation = STRDUP("");

Modified: GNUnet/src/conf/wizard_gtk.c
===================================================================
--- GNUnet/src/conf/wizard_gtk.c        2006-05-17 02:32:32 UTC (rev 2834)
+++ GNUnet/src/conf/wizard_gtk.c        2006-05-17 03:24:45 UTC (rev 2835)
@@ -649,15 +649,15 @@
   char * filename;
        
   setLibrary(lib);
+  g_thread_init(NULL);
   gtk_init(&argc, &argv); 
 #ifdef ENABLE_NLS
-  /* GTK uses UTF-8 encoding */
-  bind_textdomain_codeset(PACKAGE, "UTF-8");
+  bind_textdomain_codeset(PACKAGE, "UTF-8"); /* for gtk */
 #endif
 #ifdef WINDOWS
   FreeConsole();
 #endif
-  gtk_set_locale ();
+
   filename = getConfigurationString("GNUNET-SETUP",
                                   "FILENAME");
   conf_read(filename);