[GNUnet-SVN] r1363 - in gnunet-gtk: . src/core

[grothoff]

Author: grothoff
Date: 2005-07-09 12:24:50 -0700 (Sat, 09 Jul 2005)
New Revision: 1363

Removed:
   gnunet-gtk/ABOUT-NLS
Modified:
   gnunet-gtk/configure.ac
   gnunet-gtk/src/core/main.c
Log:
up

Deleted: gnunet-gtk/ABOUT-NLS
===================================================================
--- gnunet-gtk/ABOUT-NLS        2005-07-09 18:07:40 UTC (rev 1362)
+++ gnunet-gtk/ABOUT-NLS        2005-07-09 19:24:50 UTC (rev 1363)
@@ -1 +0,0 @@
-link /usr/share/gettext/ABOUT-NLS
\ No newline at end of file

Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac     2005-07-09 18:07:40 UTC (rev 1362)
+++ gnunet-gtk/configure.ac     2005-07-09 19:24:50 UTC (rev 1363)
@@ -228,23 +228,13 @@
 fi
 
 
-# Set PACKAGE_LOCALE_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, 
"${ac_default_prefix}/${DATADIRNAME}/locale", [locale dir])
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", 
[locale dir])
-fi
+# We define the paths here, because MinGW/GCC expands paths
+# passed through the command line ("-DDATADIR=..."). This would
+# lead to hard-coded paths ("C:\mingw\mingw\bin...") that do
+# not contain the actual installation.
+AC_DEFINE_DIR([PACKAGE_DATA_DIR], [datadir/GNUnet], [The directory for 
installing read-only architecture-independent data])
+AC_DEFINE_DIR([PACKAGE_LOCALE_DIR], [datadir/locale], [gettext catalogs])
 
-# Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, 
"${ac_default_prefix}/share/${PACKAGE}", [data dir])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [data 
dir])
-  fi
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [package data 
dir])
-fi
 
 # Set PACKAGE_SOURCE_DIR in config.h.
 packagesrcdir=`cd $srcdir && pwd`

Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c  2005-07-09 18:07:40 UTC (rev 1362)
+++ gnunet-gtk/src/core/main.c  2005-07-09 19:24:50 UTC (rev 1363)
@@ -98,7 +98,7 @@
                         argv, 
                         &parseOptions))
     return 0;
-  BINDTEXTDOMAIN(PACKAGE, PACKAGE_LOCALE_DIR);
+  BINDTEXTDOMAIN(PACKAGE_NAME, PACKAGE_LOCALE_DIR);
   textdomain(PACKAGE);
   startCron();
   initGNUnetGTKCommon();
@@ -113,6 +113,7 @@
   gtk_main();
   gdk_threads_leave(); 
   setCustomLogProc(NULL);
+  while (YES == gtkRunSomeSaveCalls()) ;    
   stopCron();
 
   doneGNUnetGTKCommon();