fix reporting gnunetd status when starting/stopping

2 files changed, 36 insertions, 43 deletions

diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 33471797..9007b9d6 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -275,7 +275,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkImage" id="statusPixmapNo">
+                                          <widget class="GtkImage" id="statusPixmap">
                                             <property name="visible">True</property>
                                             <property name="stock">gtk-no</property>
                                           </widget>
@@ -286,27 +286,6 @@ This release adds context-menus (right-click) which allow copying the URI of sea
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                        <child>
-                                          <widget class="GtkImage" id="statusPixmapYes">
-                                            <property name="visible">True</property>
-                                            <property name="stock">gtk-yes</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="padding">5</property>
-                                            <property name="position">3</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkImage" id="statusPixmapError">
-                                            <property name="stock">gtk-dialog-error</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">4</property>
-                                          </packing>
-                                        </child>
                                       </widget>
                                     </child>
                                     <child>
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index a120b03c..1e0280a6 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -131,9 +131,7 @@ doUpdateMenus (void *arg)
   int ret = *(int *) arg;
   static GtkWidget *killEntry = NULL;
   static GtkWidget *launchEntry = NULL;
-  static GtkWidget *statsEntryYes = NULL;
-  static GtkWidget *statsEntryNo = NULL;
-  static GtkWidget *statsEntryError = NULL;
+  static GtkWidget *statsEntry = NULL;
   static GtkWidget *chooser = NULL;
   static int once = 1;
   static int isLocal;
@@ -151,15 +149,9 @@ doUpdateMenus (void *arg)
       launchEntry =
         glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                               "startDaemon");
-      statsEntryYes =
+      statsEntry =
         glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                              "statusPixmapYes");
-      statsEntryNo =
-        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                              "statusPixmapNo");
-      statsEntryError =
-        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                              "statusPixmapError");
+                              "statusPixmap");
       chooser =
         glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                               "gnunetdconfigFileChooserButton");
@@ -216,26 +208,28 @@ doUpdateMenus (void *arg)
             }
           g_free (fn);
         }
-      gtk_widget_hide (statsEntryYes);
+      gtk_image_set_from_stock (GTK_IMAGE(statsEntry), GTK_STOCK_YES,
+                                GTK_ICON_SIZE_SMALL_TOOLBAR);
       gtk_widget_set_sensitive (killEntry, FALSE);
       if (canStart && isLocal)
         {
           gtk_widget_set_sensitive (launchEntry, TRUE);
-          gtk_widget_show_all (statsEntryNo);
-          gtk_widget_hide (statsEntryError);
+          gtk_image_set_from_stock (GTK_IMAGE(statsEntry), GTK_STOCK_NO,
+                                    GTK_ICON_SIZE_SMALL_TOOLBAR);
         }
       else
         {
           gtk_widget_set_sensitive (launchEntry, FALSE);
-          gtk_widget_show_all (statsEntryError);
-          gtk_widget_hide (statsEntryNo);
+          gtk_image_set_from_stock (GTK_IMAGE(statsEntry),
+                                    GTK_STOCK_DIALOG_ERROR,
+                                    GTK_ICON_SIZE_SMALL_TOOLBAR);
+
         }
     }
   else
     {
-      gtk_widget_hide (statsEntryNo);
-      gtk_widget_hide (statsEntryError);
-      gtk_widget_show_all (statsEntryYes);
+      gtk_image_set_from_stock (GTK_IMAGE(statsEntry), GTK_STOCK_YES,
+                                GTK_ICON_SIZE_SMALL_TOOLBAR);
       gtk_widget_set_sensitive (killEntry, TRUE);
       gtk_widget_set_sensitive (launchEntry, FALSE);
     }
@@ -259,6 +253,11 @@ cronCheckDaemon (void *dummy)
     {
       updateAppModel (NULL);
       last = ret;
+       GNUNET_cron_del_job (cron, &cronCheckDaemon,
+                            1/2 * GNUNET_CRON_SECONDS, NULL);
+       GNUNET_cron_add_job (cron, &cronCheckDaemon,
+                            15 * GNUNET_CRON_SECONDS,
+                            15 * GNUNET_CRON_SECONDS, NULL);
     }
   GNUNET_GTK_save_call (&doUpdateMenus, &ret);
 }
@@ -271,6 +270,7 @@ void
 on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
 {
   GtkWidget *launchEntry;
+  GtkWidget *statsEntry;
   GtkWidget *chooser;
   char *fn;
   char *user;
@@ -290,6 +290,12 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
   else
     {
       GNUNET_GTK_add_log_entry (_("Launching gnunetd...\n"));
+      statsEntry =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                              "statusPixmap");
+      gtk_image_set_from_stock (GTK_IMAGE(statsEntry), GTK_STOCK_EXECUTE,
+                                GTK_ICON_SIZE_SMALL_TOOLBAR);
+
       chooser
         = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                 "gnunetdconfigFileChooserButton");
@@ -359,8 +365,11 @@ void
 on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
 {
   GtkWidget *killEntry = NULL;
+  GtkWidget *statsEntry;
   struct GNUNET_ClientServerConnection *sock;
 
+  GNUNET_cron_del_job (cron, &cronCheckDaemon, 15 * GNUNET_CRON_SECONDS,
+                       NULL);
   killEntry =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopDaemon");
   gtk_widget_set_sensitive (killEntry, FALSE);
@@ -383,12 +392,17 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
         }
       else
         {
+          statsEntry =
+            glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                  "statusPixmap");
+          gtk_image_set_from_stock (GTK_IMAGE(statsEntry), GTK_STOCK_EXECUTE,
+                                    GTK_ICON_SIZE_SMALL_TOOLBAR);
           GNUNET_GTK_add_log_entry (_("Terminating gnunetd...\n"));
         }
       GNUNET_client_connection_destroy (sock);
     }
-  GNUNET_cron_advance_job (GNUNET_GTK_get_cron_manager (),
-                           &cronCheckDaemon, 15 * GNUNET_CRON_SECONDS, NULL);
+  GNUNET_cron_add_job (cron, &cronCheckDaemon, 1 * GNUNET_CRON_SECONDS,
+                       1/2 * GNUNET_CRON_SECONDS, NULL);
 }
 
 void