[GNUnet-SVN] r7221 - in GNUnet/src/setup: gtk ncurses

[gnunet]

Author: grothoff
Date: 2008-06-14 18:17:43 -0600 (Sat, 14 Jun 2008)
New Revision: 7221

Modified:
   GNUnet/src/setup/gtk/wizard_gtk.c
   GNUnet/src/setup/ncurses/Makefile.am
   GNUnet/src/setup/ncurses/wizard_curs.c
Log:
fixing compile errors

Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c   2008-06-14 22:53:01 UTC (rev 7220)
+++ GNUnet/src/setup/gtk/wizard_gtk.c   2008-06-15 00:17:43 UTC (rev 7221)
@@ -29,6 +29,7 @@
 #include "gnunet_util.h"
 #include "glade_support.h"
 #include "wizard_gtk.h"
+#include "wizard_util.h"
 #include "gconf.h"
 
 /**
@@ -325,7 +326,7 @@
     gtk_entry_set_text (GTK_ENTRY (entUser), user_name);
   if (group_name != NULL)
     gtk_entry_set_text (GTK_ENTRY (entGroup), group_name);
-  cap = GNUNET_configure_autostart (err_ctx, 1, 1, NULL, NULL, NULL);
+  cap = GNUNET_configure_autostart (err_ctx, GNUNET_YES, GNUNET_YES, NULL, 
NULL, NULL, NULL);
   gtk_widget_set_sensitive (entUser, cap);
 #ifdef WINDOWS
   cap = FALSE;
@@ -364,7 +365,7 @@
                                 (editCfg, "FS", "ACTIVEMIGRATION",
                                  GNUNET_YES) == GNUNET_YES);
 
-  if (GNUNET_configure_autostart (err_ctx, 1, 1, NULL, NULL, NULL))
+  if (GNUNET_configure_autostart (err_ctx, GNUNET_YES, GNUNET_YES, NULL, NULL, 
NULL, NULL))
     gtk_widget_set_sensitive (chkStart, TRUE);
 
 

Modified: GNUnet/src/setup/ncurses/Makefile.am
===================================================================
--- GNUnet/src/setup/ncurses/Makefile.am        2008-06-14 22:53:01 UTC (rev 
7220)
+++ GNUnet/src/setup/ncurses/Makefile.am        2008-06-15 00:17:43 UTC (rev 
7221)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/setup/lib
 
 plugindir = $(libdir)/GNUnet
 

Modified: GNUnet/src/setup/ncurses/wizard_curs.c
===================================================================
--- GNUnet/src/setup/ncurses/wizard_curs.c      2008-06-14 22:53:01 UTC (rev 
7220)
+++ GNUnet/src/setup/ncurses/wizard_curs.c      2008-06-15 00:17:43 UTC (rev 
7221)
@@ -43,10 +43,9 @@
 # endif
 #endif
 
-#undef GNUNET_OK
 #include "gnunet_util.h"
+#include "wizard_util.h"
 #include "gnunet_setup_lib.h"
-
 #include "wizard_curs.h"
 #include "mconf.h"
 
@@ -473,9 +472,9 @@
       showCursErr (_("Unable to create user account for daemon."), "");
       ret = GNUNET_SYSERR;
     }
-  if ((GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg, "GNUNETD", 
"AUTOSTART", GNUNET_NO)) && (GNUNET_YES != GNUNET_configure_autostart (ectx, 
GNUNET_NO, GNUNET_YES, "gnunetd",    /* specify full path? */
-                                                                               
                                                                      user_name,
-                                                                               
                                                                      
group_name)))
+  if ((GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg, "GNUNETD", 
"AUTOSTART", GNUNET_NO)) && 
+      (GNUNET_OK != GNUNET_GNS_wiz_autostart_service (ectx, 
GNUNET_SERVICE_TYPE_GNUNETD, GNUNET_YES,
+                                                     user_name, group_name)))
     {
       showCursErr (_("Unable to setup autostart for daemon."), "");
       ret = GNUNET_SYSERR;