update

3 files changed, 37 insertions, 93 deletions

diff --git a/src/plugins/stats/Makefile.am b/src/plugins/stats/Makefile.am
new file mode 100644
index 00000000..3f93b2a6
--- /dev/null
+++ b/src/plugins/stats/Makefile.am
@@ -0,0 +1,19 @@
+INCLUDES = \
+  -I$(top_srcdir)/intl \
+  -I$(top_srcdir)/src/include \
+  @GTK_CFLAGS@ \
+  @GNUNETGTK_CFLAGS@
+
+plugindir = $(libdir)/GNUnet
+
+plugin_LTLIBRARIES = \
+  libgnunetgtkmodule_stats.la
+
+libgnunetgtkmodule_stats_la_SOURCES = \
+  statistics.c
+libgnunetgtkmodule_stats_la_LIBADD = \
+  $(top_builddir)/src/common/libgnunetgtk_common.la \
+  -lgnunetutil \
+  -lgnunetstats_api
+libgnunetgtkmodule_stats_la_LDFLAGS = \
+  -export-dynamic -avoid-version -module
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);
 }
 
diff --git a/src/plugins/stats/statistics.h b/src/plugins/stats/statistics.h
deleted file mode 100644
index 536d4855..00000000
--- a/src/plugins/stats/statistics.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-     This file is part of GNUnet
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file applications/afs/gtkui/statistics.h
- * @author Christian Grothoff 
- **/
-
-#ifndef GTKUI_STATISTICS_H
-#define GTKUI_STATISTICS_H
-
-#include "platform.h"
-#include <gtk/gtk.h>
-#include <gtk/gtktext.h>
-
-/**
- * Display the statistics.
- */
-void displayStatistics(GtkWidget * widget,
-                       gpointer data);
-
-
-void initGTKStatistics();
- 
-void doneGTKStatistics();
-
-#define STAT_CONNECTIVITY 0
-#define STAT_CPU_LOAD 1
-#define STAT_IN_TRAFFIC 2
-#define STAT_OUT_TRAFFIC 3
-
-
-#endif