1 files changed, 18 insertions, 44 deletions

diff --git a/src/plugins/stats/statistics.c b/src/plugins/stats/statistics.c
index e8347fce..9a4be685 100644
--- a/src/plugins/stats/statistics.c
+++ b/src/plugins/stats/statistics.c
@@ -1,5 +1,6 @@
 /*
      This file is part of GNUnet
+     (C) 2004, 2005 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -24,13 +25,16 @@
      - add any more StatEntries, update menu accordingly.
 */
 
-#include "gnunet_afs_esed2.h"
-#include "statistics.h"
-#include "helper.h"
-#include "main.h"
-#include <glib.h>
+#include "platform.h"
+#include "gnunetgtk_common.h"
+#include <GNUnet/gnunet_stats_lib.h>
 
 #define UPDATE_INTERVAL (30 * cronSECONDS)
+#define STAT_CONNECTIVITY 0
+#define STAT_CPU_LOAD 1
+#define STAT_IN_TRAFFIC 2
+#define STAT_OUT_TRAFFIC 3
+
 
 typedef struct {
   char * statName;
@@ -481,18 +485,6 @@ static void statClose(void) {
   gtk_widget_draw(GTK_WIDGET(notebook), NULL);
 }
 
-static GtkItemFactoryEntry statWindowMenu[] = {
-  { 
-    gettext_noop("/Close display"),   
-    NULL, 
-    statClose, 
-    0, 
-    "<Item>" 
-  }
-};
-static gint statWindowMenuItems 
-  = sizeof (statWindowMenu) / sizeof (statWindowMenu[0]);
-
 
 /**
  */
@@ -911,37 +903,19 @@ static GtkWidget * create_main_window(int stat) {
 }
 
 
-/**
- * Display the statistics.
- */
-void displayStatistics(GtkWidget * widget,
-                       gpointer data) {
-  int dptr;
-  GtkWidget * wid;
-
-  dptr = (int) data;
-  if ( (dptr < 0) ||
-       (dptr >= STATS_COUNT) ) {
-    BREAK();
-  } else {    
-    wid = create_main_window(dptr);
-    if (wid != NULL)
-      addToNotebook(_(stats[dptr].paneName),
-                    wid);
-  }
-}
 
-void initGTKStatistics() {
+
+
+void init_stats() {
   MUTEX_CREATE_RECURSIVE(&lock);
+  wid = create_main_window(dptr);
+  if (wid != NULL)
+    addToNotebook(_(stats[dptr].paneName),
+                  wid);
+  
 }
 
-void doneGTKStatistics() {
-  unsigned int i;
-  for (i=0;i<lsv_size;i++)
-    FREE(lastStatValues[i].statName);
-  GROW(lastStatValues,
-       lsv_size,
-       0);
+void done_stats() {
   MUTEX_DESTROY(&lock);
 }