1 files changed, 143 insertions, 0 deletions

diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 0dd1b9ec..f566f45e 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -466,6 +466,148 @@ statsProcessor (const char *optName, unsigned long long value, void *data)
   return GNUNET_OK;
 }
 
+/*
+ * Update the status bar indicator about daemon and connexions status
+ */
+static void *
+updateDaemonStatus (void *delta)
+{
+  static gboolean once = TRUE;
+  static int last_status = -5;
+  long long connected_peers;
+  char *label;
+  static GtkWidget *statusConnexionsLabel;
+  static GtkWidget *statusConnexionsPic;
+#if GTK_CHECK_VERSION (2,10,0)
+  static GdkPixbuf *iconNoDaemon;
+  static GdkPixbuf *iconDisconnected;
+  static GdkPixbuf *iconConnected;
+#endif
+  
+  if (once)
+  {
+    statusConnexionsLabel = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                               "statusConnexionsLabel");
+    statusConnexionsPic = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                               "statusConnexionsPic");
+#if GTK_CHECK_VERSION (2,10,0)
+    char *iconFile;
+    char *finalPath;
+    char *instDir;
+    char *dataDir;
+    
+    instDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
+    dataDir = g_strconcat (instDir, "/../gnunet-gtk/", NULL);
+#if MINGW
+    finalPath = GNUNET_malloc (_MAX_PATH + 1);
+    plibc_conv_to_win_path (dataDir, finalPath);
+#else
+    finalPath = GNUNET_strdup (dataDir);
+#endif
+    GNUNET_free (instDir);
+    g_free (dataDir);
+    iconFile = g_strconcat (finalPath, "tray-nodaemon.png", NULL);
+    iconNoDaemon = gdk_pixbuf_new_from_file (iconFile, NULL);
+    g_free (iconFile);
+    iconFile = g_strconcat (finalPath, "tray-disconnected.png", NULL);
+    iconDisconnected = gdk_pixbuf_new_from_file (iconFile, NULL);
+    g_free (iconFile);
+    iconFile = g_strconcat (finalPath, "tray-connected.png", NULL);
+    iconConnected = gdk_pixbuf_new_from_file (iconFile, NULL);
+    g_free (iconFile);
+    GNUNET_free (finalPath);
+#endif
+
+    once = FALSE;
+  }
+  if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
+    {      
+        if (GNUNET_OK != getStatValue (&connected_peers, (GNUNET_CronTime *) delta,
+                                       NULL, "# of connected peers", GNUNET_NO))
+        {
+      if (last_status != -1)
+        {
+          GNUNET_GTK_add_log_entry (_("WARNING: Failed to obtain connection statistics from gnunetd.\n"));
+          gtk_label_set_text (GTK_LABEL(statusConnexionsLabel),
+                              _("Unknown status"));
+          gtk_image_set_from_stock (GTK_IMAGE(statusConnexionsPic),
+                                    GTK_STOCK_DIALOG_ERROR, 1);
+#if GTK_CHECK_VERSION (2,10,0)
+          gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+                                       _("Unknown status"));
+          gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon(),
+                                           iconNoDaemon);
+#endif
+          last_status = -1;
+        }
+    }
+      else if (connected_peers > 0)
+      {
+        if (last_status != connected_peers)
+      {
+        if (connected_peers == 1)
+          {
+            gtk_label_set_text (GTK_LABEL(statusConnexionsLabel),
+                                _("Connected to 1 peer"));
+#if GTK_CHECK_VERSION (2,10,0)
+            gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+                                         _("GNUnet - Connected to 1 peer"));
+#endif
+          }
+        else
+          {
+            label = g_strdup_printf (_("Connected to %Lu peers"),
+                                     connected_peers);
+            gtk_label_set_text (GTK_LABEL(statusConnexionsLabel), label);
+            g_free (label);
+#if GTK_CHECK_VERSION (2,10,0)
+            label = g_strdup_printf (_("GNUnet - Connected to %Lu peers"),
+                                     connected_peers);
+            gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (), label);
+            g_free (label);
+#endif
+          }
+#if GTK_CHECK_VERSION (2,10,0)
+        gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon(),
+                                         iconConnected);
+#endif
+        gtk_image_set_from_stock (GTK_IMAGE(statusConnexionsPic),
+                                  GTK_STOCK_NETWORK, 1);
+        last_status = connected_peers;
+      }
+      }
+      else if (last_status != 0)
+      {
+        gtk_label_set_markup (GTK_LABEL(statusConnexionsLabel),
+                              _("<b>Disconnected</b>"));
+        gtk_image_set_from_stock (GTK_IMAGE(statusConnexionsPic),
+                                    GTK_STOCK_DISCONNECT, 1);
+#if GTK_CHECK_VERSION (2,10,0)
+          gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+                                        _("GNUnet - Disconnected"));
+          gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon(),
+                                           iconDisconnected);
+#endif
+          last_status = 0;
+            }
+    }
+  else if (last_status != -2)
+    {
+      gtk_label_set_markup (GTK_LABEL(statusConnexionsLabel),
+                             _("<b>Daemon not running</b>"));
+      gtk_image_set_from_stock (GTK_IMAGE(statusConnexionsPic),
+                                GTK_STOCK_NO, 1);
+#if GTK_CHECK_VERSION (2,10,0)
+      gtk_status_icon_set_tooltip (GNUNET_GTK_get_trayIcon (),
+                                   _("GNUnet - Daemon not running"));
+      gtk_status_icon_set_from_pixbuf (GNUNET_GTK_get_trayIcon(),
+                                       iconNoDaemon);
+#endif
+      last_status = -2;
+    }
+  return NULL;
+}
+
 /**
  * Cron-job that updates all stat values.
  */
@@ -482,6 +624,7 @@ updateStatValues (void *unused)
   if (GNUNET_OK ==
       GNUNET_STATS_get_statistics (ectx, sock, &statsProcessor, &delta))
     lastUpdate = now;
+  GNUNET_GTK_save_call (&updateDaemonStatus, (void *) &delta);
   GNUNET_mutex_unlock (lock);
 }