[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r784 - in GNUnet/src: conf include util
From: |
durner |
Subject: |
[GNUnet-SVN] r784 - in GNUnet/src: conf include util |
Date: |
Fri, 13 May 2005 12:54:48 -0700 (PDT) |
Author: durner
Date: 2005-05-13 12:53:52 -0700 (Fri, 13 May 2005)
New Revision: 784
Modified:
GNUnet/src/conf/gconf.c
GNUnet/src/conf/wizard.c
GNUnet/src/include/gnunet_util.h
GNUnet/src/util/initialize.c
Log:
the locale dir is now specified in configure.ac
Modified: GNUnet/src/conf/gconf.c
===================================================================
--- GNUnet/src/conf/gconf.c 2005-05-13 16:21:13 UTC (rev 783)
+++ GNUnet/src/conf/gconf.c 2005-05-13 19:53:52 UTC (rev 784)
@@ -1700,6 +1700,7 @@
#endif
/* GTK stuffs */
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
gtk_set_locale();
gtk_init(&ac, &av);
Modified: GNUnet/src/conf/wizard.c
===================================================================
--- GNUnet/src/conf/wizard.c 2005-05-13 16:21:13 UTC (rev 783)
+++ GNUnet/src/conf/wizard.c 2005-05-13 19:53:52 UTC (rev 784)
@@ -288,14 +288,9 @@
wizard_main (int argc, char *argv[])
{
#ifdef ENABLE_NLS
- char lcdir[251];
const char * LANG;
char * configFile;
- setlocale (LC_ALL, "");
- getLocaleDir(lcdir);
- bindtextdomain(PACKAGE, lcdir);
- textdomain(PACKAGE);
/* GTK uses UTF-8 encoding */
bind_textdomain_codeset(PACKAGE, "UTF-8");
#endif
Modified: GNUnet/src/include/gnunet_util.h
===================================================================
--- GNUnet/src/include/gnunet_util.h 2005-05-13 16:21:13 UTC (rev 783)
+++ GNUnet/src/include/gnunet_util.h 2005-05-13 19:53:52 UTC (rev 784)
@@ -2301,13 +2301,7 @@
const char *ent);
void doneParseConfig();
-
/**
- * Location of the gettext catalog
- */
-void getLocaleDir(char *dir);
-
-/**
* open() a file
*/
int fileopen(const char *filename, int oflag, ...);
Modified: GNUnet/src/util/initialize.c
===================================================================
--- GNUnet/src/util/initialize.c 2005-05-13 16:21:13 UTC (rev 783)
+++ GNUnet/src/util/initialize.c 2005-05-13 19:53:52 UTC (rev 784)
@@ -105,17 +105,6 @@
void doneCron();
/**
- * Get location of gettext catalogs
- */
-void getLocaleDir(char *dir) {
-#ifdef WINDOWS
- plibc_conv_to_win_path("/share/locale/", dir);
-#else
- strcpy(dir, LOCALEDIR);
-#endif
-}
-
-/**
* Initialize the util library. Use argc, argv and the given parser
* for processing command-line options <strong>after</strong> the
* configuration module was initialized, but <strong>before</strong> logging
@@ -124,15 +113,13 @@
int initUtil(int argc,
char * argv[],
CommandLineParser parser) {
- char lcdir[251];
#ifdef MINGW
InitWinEnv();
#endif
setlocale (LC_ALL, "");
- getLocaleDir(lcdir);
- bindtextdomain (PACKAGE, lcdir);
+ bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
gnunet_util_initIO();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r784 - in GNUnet/src: conf include util,
durner <=