[GNUnet-SVN] r13482 - in gnunet-setup: . src

[gnunet]

Author: grothoff
Date: 2010-11-01 13:13:35 +0100 (Mon, 01 Nov 2010)
New Revision: 13482

Modified:
   gnunet-setup/TODO
   gnunet-setup/src/gnunet-setup.c
   gnunet-setup/src/os_installation.c
Log:
stuff

Modified: gnunet-setup/TODO
===================================================================
--- gnunet-setup/TODO   2010-11-01 12:09:57 UTC (rev 13481)
+++ gnunet-setup/TODO   2010-11-01 12:13:35 UTC (rev 13482)
@@ -1,8 +1,6 @@
-* build system (copy from gnunet-gtk)
-  - configure.ac
-  - Makefile.am
-  - README
 * main (launch master dialog)
+  - launch dialog, not run window! 
+  - handle dialog close (X)
 * implement cancel, save, save-as
 * draft UI <-> config linkage specification struct:
   - help text, help URI

Modified: gnunet-setup/src/gnunet-setup.c
===================================================================
--- gnunet-setup/src/gnunet-setup.c     2010-11-01 12:09:57 UTC (rev 13481)
+++ gnunet-setup/src/gnunet-setup.c     2010-11-01 12:13:35 UTC (rev 13482)
@@ -317,7 +317,7 @@
 
   /* setup main window */
   mc->main_window = GTK_WIDGET (gtk_builder_get_object (mc->builder, 
-                                                       
"GNUNET_GTK_main_window"));
+                                                       "GNUNET_setup_dialog"));
   gtk_window_maximize (GTK_WINDOW (mc->main_window));
 
   gtk_widget_show (mc->main_window);

Modified: gnunet-setup/src/os_installation.c
===================================================================
--- gnunet-setup/src/os_installation.c  2010-11-01 12:09:57 UTC (rev 13481)
+++ gnunet-setup/src/os_installation.c  2010-11-01 12:13:35 UTC (rev 13482)
@@ -217,7 +217,7 @@
   while (NULL != (end = strchr (pos, ':')))
     {
       *end = '\0';
-      sprintf (buf, "%s/%s", pos, "gnunet-gtk");
+      sprintf (buf, "%s/%s", pos, "gnunet-setup");
       if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
         {
           pos = GNUNET_strdup (pos);
@@ -227,7 +227,7 @@
         }
       pos = end + 1;
     }
-  sprintf (buf, "%s/%s", pos, "gnunet-gtk");
+  sprintf (buf, "%s/%s", pos, "gnunet-setup");
   if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
     {
       pos = GNUNET_strdup (pos);
@@ -296,7 +296,7 @@
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               _
               ("Could not determine installation path for %s.  Set `%s' 
environment variable.\n"),
-             "gnunet-gtk",
+             "gnunet-setup",
               "GNUNET_GTK_PREFIX");
   return NULL;
 }
@@ -409,14 +409,14 @@
     case GNUNET_OS_IPK_LIBDIR:
       if (isbasedir)
         dirname =
-          DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet-gtk"
+          DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet-setup"
           DIR_SEPARATOR_STR;
       else
-        dirname = DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR;
+        dirname = DIR_SEPARATOR_STR "gnunet-setup" DIR_SEPARATOR_STR;
       break;
     case GNUNET_OS_IPK_DATADIR:
       dirname =
-        DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet-gtk"
+        DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet-setup"
         DIR_SEPARATOR_STR;
       break;
     case GNUNET_OS_IPK_ICONDIR: