aboutsummaryrefslogtreecommitdiff
path: root/src/setup/gnunet-setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/setup/gnunet-setup.c')
-rw-r--r--src/setup/gnunet-setup.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index d4da0554..f1bc7c23 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -24,7 +24,6 @@
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#include "gnunet-setup.h" 26#include "gnunet-setup.h"
27#include "gnunet-setup-transport.h"
28#include "gnunet-setup-options.h" 27#include "gnunet-setup-options.h"
29#include <gnunet/gnunet_constants.h> 28#include <gnunet/gnunet_constants.h>
30#include <regex.h> 29#include <regex.h>
@@ -53,11 +52,6 @@ struct GNUNET_CONFIGURATION_Handle *cfg;
53 */ 52 */
54static int gret; 53static int gret;
55 54
56/**
57 * Run autoconfig-only and then exit immediately.
58 */
59static int do_autoconfig;
60
61#ifndef MINGW 55#ifndef MINGW
62/** 56/**
63 * Flag to enable privilege escalation. 57 * Flag to enable privilege escalation.
@@ -433,18 +427,6 @@ GNUNET_setup_launch_edit_friends_button_clicked_cb (GtkButton *button,
433 427
434 428
435/** 429/**
436 * Called once the autoconfiguration is done. Triggers shutdown.
437 *
438 * @param cls unused
439 */
440static void
441autoconfig_finished_cb (void *cls)
442{
443 GNUNET_SCHEDULER_shutdown ();
444}
445
446
447/**
448 * Actual main method that sets up the configuration window. 430 * Actual main method that sets up the configuration window.
449 * 431 *
450 * @param cls the main loop handle 432 * @param cls the main loop handle
@@ -519,13 +501,6 @@ run (void *cls)
519 main_window); 501 main_window);
520 load_options (); 502 load_options ();
521 GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL); 503 GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
522 if (do_autoconfig)
523 {
524 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
525 _("Attempting fully-automatic, non-interactive network configuration\n"));
526 GNUNET_setup_transport_autoconfig_start (&autoconfig_finished_cb, NULL);
527 return;
528 }
529 gtk_widget_show (main_window); 504 gtk_widget_show (main_window);
530 gtk_window_present (GTK_WINDOW (main_window)); 505 gtk_window_present (GTK_WINDOW (main_window));
531} 506}
@@ -542,9 +517,6 @@ int
542main (int argc, char *const *argv) 517main (int argc, char *const *argv)
543{ 518{
544 struct GNUNET_GETOPT_CommandLineOption options[] = { 519 struct GNUNET_GETOPT_CommandLineOption options[] = {
545 { 'a', "autoconfig", NULL,
546 gettext_noop ("attempt automatic configuration of the network and instantly exit"),
547 0, &GNUNET_GETOPT_set_one, &do_autoconfig },
548#ifndef MINGW 520#ifndef MINGW
549 { 'e', "elevate-priviledges", NULL, 521 { 'e', "elevate-priviledges", NULL,
550 gettext_noop ("run as user 'gnunet', if necessary by executing gksu to elevate rights"), 522 gettext_noop ("run as user 'gnunet', if necessary by executing gksu to elevate rights"),