1 files changed, 76 insertions, 6 deletions

diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index cf8b4f43..178a4732 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -190,7 +190,7 @@ doUpdateMenus (void *arg)
                         canStart = (geteuid () == 0);
                       else
                         canStart = 1;
-                    }
+                    }                 
 #else
                   canStart = 1;
 #endif
@@ -415,9 +415,26 @@ init_daemon (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
                                 ("Configuration file for GNUnet daemon `%s' does not exist! Run `gnunet-setup -d'.\n"),
                                 daemon_config);
     }
+  
+#ifndef WITH_LIBGKSU2
+  GtkWidget *startDaemonConfWizard;
+  GtkWidget *startDaemonConfTool;
+
+  startDaemonConfWizard
+        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                "startDaemonConfWizard");
+  startDaemonConfTool
+        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                "startDaemonConfTool");
+  if (0 != ACCESS (daemon_config, W_OK))
+    {
+      gtk_widget_set_sensitive (startDaemonConfWizard, FALSE);
+      gtk_widget_set_sensitive (startDaemonConfTool, FALSE);
+    }
+#endif
   GNUNET_free (daemon_config);
 
-  cron = GNUNET_GTK_get_cron_manager ();
+ cron = GNUNET_GTK_get_cron_manager ();
   GNUNET_cron_add_job (cron, &cronCheckDaemon, 0, 15 * GNUNET_CRON_SECONDS,
                        NULL);
   GNUNET_cron_add_job (cron, &updateAppModel, 5 * GNUNET_CRON_MINUTES,
@@ -437,24 +454,77 @@ done_daemon ()
                           "applicationList");
   gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
 
+  w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "applicationList");
+  gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
+
 }
 
 /**
 * Launch 'gnunet-setup -d wizard-gtk' with needed rights
 */
 void
-on_startDaemonConfWizard_clicked_daemon (GtkWidget * widget, gpointer data)
+on_startDaemonConfWizard_clicked_daemon (GtkWidget *widget, gpointer data)
 {
-  GNUNET_GTK_run_gnunet_setup (TRUE);
+  GtkWidget *filechooserbutton;
+  char *conffile;
+
+  filechooserbutton
+        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                "gnunetdconfigFileChooserButton");
+  conffile = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(filechooserbutton));
+  GNUNET_GTK_run_gnunet_setup (conffile, TRUE);
+  GNUNET_free (conffile);
 }
 
 /**
 * Launch 'gnunet-setup -d gconfig' with needed rights
 */
 void
-on_startDaemonConfTool_clicked_daemon (GtkWidget * widget, gpointer data)
+on_startDaemonConfTool_clicked_daemon (GtkWidget *widget, gpointer data)
 {
-  GNUNET_GTK_run_gnunet_setup (FALSE);
+  GtkWidget *filechooserbutton;
+  char *conffile;
+
+  filechooserbutton
+        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                "gnunetdconfigFileChooserButton");
+  conffile = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(filechooserbutton));
+  GNUNET_GTK_run_gnunet_setup (conffile, FALSE);
+  GNUNET_free (conffile);
+}
+
+/**
+* Update sensitivity of daemon configuration buttons
+*/
+void
+on_gnunetdconfigfile_set_daemon (GtkWidget *filechooserbutton,
+                                 gpointer data)
+{
+#ifndef WITH_LIBGKSU2
+  GtkWidget *startDaemonConfWizard;
+  GtkWidget *startDaemonConfTool;
+  char *conffile;
+
+  startDaemonConfWizard
+        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                "startDaemonConfWizard");
+  startDaemonConfTool
+        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                "startDaemonConfTool");
+  conffile = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(filechooserbutton));
+  if (0 == ACCESS (conffile, W_OK))
+    {
+      gtk_widget_set_sensitive (startDaemonConfWizard, TRUE);
+      gtk_widget_set_sensitive (startDaemonConfTool, TRUE);
+    }
+   else
+    {
+      gtk_widget_set_sensitive (startDaemonConfWizard, FALSE);
+      gtk_widget_set_sensitive (startDaemonConfTool, FALSE);
+    }
+  GNUNET_free_non_null (conffile);
+#endif
+  return;
 }
 
 /* end of daemon.c */