[GNUnet-SVN] r889 - in GNUnet: . src/util

[durner]

Author: durner
Date: 2005-06-08 14:06:29 -0700 (Wed, 08 Jun 2005)
New Revision: 889

Modified:
   GNUnet/src/util/configuration.c
   GNUnet/src/util/identity.c
   GNUnet/src/util/state.c
   GNUnet/todo
Log:
fixes

Modified: GNUnet/src/util/configuration.c
===================================================================
--- GNUnet/src/util/configuration.c     2005-06-08 19:07:22 UTC (rev 888)
+++ GNUnet/src/util/configuration.c     2005-06-08 21:06:29 UTC (rev 889)
@@ -343,7 +343,9 @@
   prefix = getConfigurationString(section,
                                  &orig[1]);
   if (prefix == NULL)
-    prefix = getConfigurationString("", &orig[1]);
+    prefix = getConfigurationString("GNUNETD", &orig[1]);
+  if (prefix == NULL)
+    prefix = getConfigurationString("GNUNET", &orig[1]);
   if (prefix == NULL) {
     orig[i] = DIR_SEPARATOR;
     return orig;

Modified: GNUnet/src/util/identity.c
===================================================================
--- GNUnet/src/util/identity.c  2005-06-08 19:07:22 UTC (rev 888)
+++ GNUnet/src/util/identity.c  2005-06-08 21:06:29 UTC (rev 889)
@@ -278,9 +278,6 @@
            "use %u.%u.%u.%u.\n"), 
          interfaces, 
          PRIP(ntohl(dwIP)));
-    else
-      LOG(LOG_DEBUG, _("GNUnet now uses the IP address %u.%u.%u.%u.\n"),
-        PRIP(ntohl(dwIP)));
 
     identity->addr = dwIP;
     
@@ -321,6 +318,9 @@
     closesocket(s);    
     identity->addr = theHost.sin_addr.S_un.S_addr;
   }
+
+  LOG(LOG_DEBUG, _("GNUnet now uses the IP address %u.%u.%u.%u.\n"),
+    PRIP(ntohl(identity->addr)));
   
   return OK;
 #endif

Modified: GNUnet/src/util/state.c
===================================================================
--- GNUnet/src/util/state.c     2005-06-08 19:07:22 UTC (rev 888)
+++ GNUnet/src/util/state.c     2005-06-08 21:06:29 UTC (rev 889)
@@ -84,7 +84,7 @@
   dir = getFileName(baseSect,
                    base,
                    _("Configuration file must specify a directory"
-                     " for GNUnet to store per-peer data under %s%s.\n"));
+                     " for GNUnet to store per-peer data under %s\\%s.\n"));
   dbh = getDirectory(dir);
   FREE(dir);
   GNUNET_ASSERT(dbh != NULL);

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2005-06-08 19:07:22 UTC (rev 888)
+++ GNUnet/todo 2005-06-08 21:06:29 UTC (rev 889)
@@ -2,9 +2,9 @@
 - FSUI: directory creation (uploadAll) broken! [ empty directories! ]
 - gnunet-gtk (debug)
 - gnunet-setup:
-   curses wizard?  [ Nils ];
-   template path adjustment for non gconf setup [ Nils ]
-       
+  * gconfig: fix focus changes
+  * wizards: restrict user & service creation to platforms
+    known to be working.  
 
 0.7.0 [6'05?] (aka "compatibility? what's that?"):
 - Missing Features: