app list

2 files changed, 84 insertions, 65 deletions

diff --git a/TODO b/TODO
index 1e9134c3..8115e013 100644
--- a/TODO
+++ b/TODO
@@ -15,10 +15,10 @@ Important (for 0.7.0):
     * need visual feedback for collection status!
   - stop collection [ easy, CG ]
     * enable start collection!
-* list available apps [ easy, CG ]
+
 
 Later (0.7.1):
-0) stats integration [ medium ]
+0) stats integration (daemon+own module for graphical stats) [ medium ]
 1) auto-rename downloaded files 
    to better names (user feedback!?) [ medium ]
 2) create directory from known file IDs [ medium ]
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 6939f37b..c0d4a4f4 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -29,6 +29,78 @@
 #include <GNUnet/gnunet_getoption_lib.h>
 
 
+
+/**
+ * cron job that periodically updates the model for the
+ * application list.
+ */
+static void updateAppModelSafe(void * unused) {
+  GNUNET_TCP_SOCKET * sock;
+  GtkWidget * w;
+  GtkListStore * model;
+  GtkTreeIter iter;
+  char * apps;
+  char * next;
+  char * pos;
+  char * desc;
+ 
+  model = gtk_list_store_new(2,
+                             G_TYPE_STRING,
+                             G_TYPE_STRING);
+  sock = getClientSocket();
+  if (sock == NULL) {
+    apps = NULL;
+  } else {
+    apps
+      = getConfigurationOptionValue(sock,
+                                    "GNUNETD",
+                                    "APPLICATIONS");
+  }
+  if (apps != NULL) {    
+    next = apps;
+    do {
+      while (*next == ' ')
+        next++;
+      pos = next;
+      while ( (*next != '\0') &&
+              (*next != ' ') )
+        next++;
+      if (*next == '\0') {
+        next = NULL; /* terminate! */
+      } else {
+        *next = '\0'; /* add 0-termination for pos */
+        next++;
+      }
+      if (strlen(pos) > 0) {
+        desc
+          = getConfigurationOptionValue(sock,
+                                        "ABOUT",
+                                        pos);
+        
+        gtk_list_store_append(model,
+                              &iter);
+        gtk_list_store_set(model,
+                           &iter,
+                           0, pos,
+                           1, desc,
+                           -1);
+        FREENONNULL(desc);
+      }    
+    } while (next != NULL);    
+    FREE(apps);
+  }
+  w = glade_xml_get_widget(getMainXML(),
+                           "applicationList");
+  gtk_tree_view_set_model(GTK_TREE_VIEW(w),
+                          GTK_TREE_MODEL(model));
+  releaseClientSocket(sock);
+}
+
+static void updateAppModel(void * dummy) {
+  gtkSaveCall(&updateAppModelSafe, NULL);
+}
+
+
 static void doUpdateMenus(void * arg) {
   int ret = *(int*) arg;
   static GtkWidget * killEntry = NULL;
@@ -62,6 +134,7 @@ static void doUpdateMenus(void * arg) {
       isLocal = FALSE;
     FREENONNULL(host);
   }
+  updateAppModelSafe(NULL);
   if (ret == SYSERR) {
     gtk_widget_hide(statsEntryYes);
     gtk_widget_show_all(statsEntryNo);
@@ -102,7 +175,7 @@ void on_startDaemon_clicked(GtkWidget * widget,
     return;
   } else {      
     addLogEntry(_("Launching gnunetd..."));
-    if (OK == startGNUnetDaemon(YES)) {
+    if (SYSERR != startGNUnetDaemon(YES)) {
       addLogEntry(_("Launched gnunetd"));
     } else {
       addLogEntry(_("Launching gnunetd failed"));
@@ -140,67 +213,6 @@ void on_stopDaemon_clicked(GtkWidget * widget,
   cronCheckDaemon(NULL);
 }
 
-
-/**
- * cron job that periodically updates the model for the
- * application list.
- */
-static void updateAppModelSafe(void * unused) {
-  GNUNET_TCP_SOCKET * sock;
-  GtkWidget * w;
-  GtkListStore * model;
-  GtkTreeIter iter;
-  char * apps;
-  char * next;
-  char * pos;
- 
-  model = gtk_list_store_new(1, G_TYPE_STRING);
-  sock = getClientSocket();
-  if (sock == NULL) {
-    apps = NULL;
-  } else {
-    apps
-      = getConfigurationOptionValue(sock,
-                                    "GNUNETD",
-                                    "APPLICATIONS");
-    releaseClientSocket(sock);
-  }
-  if (apps != NULL) {    
-    next = apps;
-    do {
-      while (*next == ' ')
-        next++;
-      pos = next;
-      while ( (*next != '\0') &&
-              (*next != ' ') )
-        next++;
-      if (*next == '\0') {
-        next = NULL; /* terminate! */
-      } else {
-        *next = '\0'; /* add 0-termination for pos */
-        next++;
-      }
-      if (strlen(pos) > 0) {
-        gtk_list_store_append(model,
-                              &iter);
-        gtk_list_store_set(model,
-                           &iter,
-                           0, pos,
-                           -1);
-      }    
-    } while (next != NULL);    
-    FREE(apps);
-  }
-  w = glade_xml_get_widget(getMainXML(),
-                           "applicationList");
-  gtk_tree_view_set_model(GTK_TREE_VIEW(w),
-                          GTK_TREE_MODEL(model));
-}
-
-static void updateAppModel(void * dummy) {
-  gtkSaveCall(&updateAppModelSafe, NULL);
-}
-
 void init_daemon() {
   GtkWidget * tab;
   GtkWidget * apps;
@@ -216,10 +228,17 @@ void init_daemon() {
   renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(apps),
                                               -1,
-                                              _("Applications"),
+                                              _("Application"),
                                               renderer,
                                               "text", 0,
                                               NULL);
+  renderer = gtk_cell_renderer_text_new();
+  gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(apps),
+                                              -1,
+                                              _("Description"),
+                                              renderer,
+                                              "text", 1,
+                                              NULL);
 
   updateAppModelSafe(NULL);
   tab