[GNUnet-SVN] r1263 - in gnunet-gtk/src: common core include plugins/about plugins/daemon plugins/fs

[grothoff]

Author: grothoff
Date: 2005-07-04 16:45:28 -0700 (Mon, 04 Jul 2005)
New Revision: 1263

Removed:
   gnunet-gtk/src/include/main.h
Modified:
   gnunet-gtk/src/common/helper.c
   gnunet-gtk/src/core/main.c
   gnunet-gtk/src/plugins/about/Makefile.am
   gnunet-gtk/src/plugins/about/about.c
   gnunet-gtk/src/plugins/daemon/Makefile.am
   gnunet-gtk/src/plugins/daemon/daemon.c
   gnunet-gtk/src/plugins/fs/Makefile.am
   gnunet-gtk/src/plugins/fs/download.c
   gnunet-gtk/src/plugins/fs/download.h
   gnunet-gtk/src/plugins/fs/search.c
   gnunet-gtk/src/plugins/fs/search.h
   gnunet-gtk/src/plugins/fs/upload.c
   gnunet-gtk/src/plugins/fs/upload.h
Log:
update

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2005-07-04 23:36:52 UTC (rev 1262)
+++ gnunet-gtk/src/common/helper.c      2005-07-04 23:45:28 UTC (rev 1263)
@@ -24,14 +24,13 @@
 
 #include "platform.h"
 #include "helper.h"
-#include <stdlib.h>
-#ifndef MINGW
- #include <sys/wait.h>
-#endif
-#include "main.h"
 
 #define HELPER_DEBUG NO
 
+GladeXML * mainXML;
+
+char *gladeFile = NULL;
+
 GtkWidget * infoWindow = NULL;
 
 static GtkWidget * infoText = NULL;

Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c  2005-07-04 23:36:52 UTC (rev 1262)
+++ gnunet-gtk/src/core/main.c  2005-07-04 23:45:28 UTC (rev 1263)
@@ -28,8 +28,6 @@
 #include "gettext.h"
 
 #include <GNUnet/gnunet_util.h>
-
-#include "main.h"
 #include "helper.h"
 
 /**
@@ -104,7 +102,7 @@
   Plugin * p;
   void * lib;
 
-  lib = loadDynamicLibrary("libgnunetgtk_plugin",
+  lib = loadDynamicLibrary("libgnunetgtkmodule_",
                           name);
   if (lib == NULL) {
     LOG(LOG_WARNING,
@@ -160,9 +158,6 @@
   FREE(plug);
 }
 
-GladeXML * mainXML;
-char *gladeFile = NULL;
-
 int main(int argc, 
         char *argv[]) {
   Plugin * plugin;
@@ -179,6 +174,8 @@
   /* load the plugins */
   load = getConfigurationString("GNUNET-GTK",
                                "PLUGINS");
+  if (load == NULL)
+    load = STRDUP("about daemon fs");
   plugin = loadPlugins(load, NULL);
   FREE(load);
   /* load the interface */

Deleted: gnunet-gtk/src/include/main.h
===================================================================
--- gnunet-gtk/src/include/main.h       2005-07-04 23:36:52 UTC (rev 1262)
+++ gnunet-gtk/src/include/main.h       2005-07-04 23:45:28 UTC (rev 1263)
@@ -1,33 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 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
-     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 src/main.h
- * @brief globals of gnunet-gtk
- * @author Christian Grothoff
- */
-
-#ifndef MAIN_H
-#define MAIN_H
-
-#include <gtk/gtk.h>
-
-
-#endif

Modified: gnunet-gtk/src/plugins/about/Makefile.am
===================================================================
--- gnunet-gtk/src/plugins/about/Makefile.am    2005-07-04 23:36:52 UTC (rev 
1262)
+++ gnunet-gtk/src/plugins/about/Makefile.am    2005-07-04 23:45:28 UTC (rev 
1263)
@@ -4,7 +4,7 @@
   @GTK_CFLAGS@ \
   @GNUNETGTK_CFLAGS@
 
-plugindir = $(libdir)/gnunet-gtk
+plugindir = $(libdir)/GNUnet
 
 plugin_LTLIBRARIES = \
   libgnunetgtkmodule_about.la
@@ -12,6 +12,7 @@
 libgnunetgtkmodule_about_la_SOURCES = \
   about.c
 libgnunetgtkmodule_about_la_LIBADD = \
-  $(top_builddir)/src/common/libgnunetgtk_common.la 
+  $(top_builddir)/src/common/libgnunetgtk_common.la \
+  -lgnunetutil
 libgnunetgtkmodule_about_la_LDFLAGS = \
   -export-dynamic -avoid-version -module

Modified: gnunet-gtk/src/plugins/about/about.c
===================================================================
--- gnunet-gtk/src/plugins/about/about.c        2005-07-04 23:36:52 UTC (rev 
1262)
+++ gnunet-gtk/src/plugins/about/about.c        2005-07-04 23:45:28 UTC (rev 
1263)
@@ -26,7 +26,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "helper.h"
 
 /**
  * This displays an about window

Modified: gnunet-gtk/src/plugins/daemon/Makefile.am
===================================================================
--- gnunet-gtk/src/plugins/daemon/Makefile.am   2005-07-04 23:36:52 UTC (rev 
1262)
+++ gnunet-gtk/src/plugins/daemon/Makefile.am   2005-07-04 23:45:28 UTC (rev 
1263)
@@ -4,7 +4,7 @@
   @GTK_CFLAGS@ \
   @GNUNETGTK_CFLAGS@
  
-plugindir = $(libdir)/gnunet-gtk
+plugindir = $(libdir)/GNUnet
  
 plugin_LTLIBRARIES = \
   libgnunetgtkmodule_daemon.la
@@ -13,6 +13,6 @@
   daemon.c
 libgnunetgtkmodule_daemon_la_LIBADD = \
   $(top_builddir)/src/common/libgnunetgtk_common.la \
-  -lgnunet_util
+  -lgnunetutil
 libgnunetgtkmodule_daemon_la_LDFLAGS = \
   -export-dynamic -avoid-version -module

Modified: gnunet-gtk/src/plugins/daemon/daemon.c
===================================================================
--- gnunet-gtk/src/plugins/daemon/daemon.c      2005-07-04 23:36:52 UTC (rev 
1262)
+++ gnunet-gtk/src/plugins/daemon/daemon.c      2005-07-04 23:45:28 UTC (rev 
1263)
@@ -25,8 +25,6 @@
  */
 
 #include "platform.h"
-
-#include "main.h"
 #include "helper.h"
 #include <GNUnet/gnunet_util.h>
 

Modified: gnunet-gtk/src/plugins/fs/Makefile.am
===================================================================
--- gnunet-gtk/src/plugins/fs/Makefile.am       2005-07-04 23:36:52 UTC (rev 
1262)
+++ gnunet-gtk/src/plugins/fs/Makefile.am       2005-07-04 23:45:28 UTC (rev 
1263)
@@ -4,7 +4,7 @@
   @GTK_CFLAGS@ \
   @GNUNETGTK_CFLAGS@
 
-plugindir = $(libdir)/gnunet-gtk
+plugindir = $(libdir)/GNUnet
  
 plugin_LTLIBRARIES = \
   libgnunetgtkmodule_fs.la
@@ -20,7 +20,10 @@
   @GNUNETGTK_LIBS@ \
   $(INTLLIBS) \
   -lgthread-2.0 \
-  -lextractor
+  -lextractor \
+  -lgnunetutil \
+  -lgnunetfsui \
+  -lgnunetecrs
 libgnunetgtkmodule_fs_la_LDFLAGS = \
   -export-dynamic -avoid-version -module
 

Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c        2005-07-04 23:36:52 UTC (rev 
1262)
+++ gnunet-gtk/src/plugins/fs/download.c        2005-07-04 23:45:28 UTC (rev 
1263)
@@ -19,14 +19,13 @@
 */
 
 /**
- * @file src/download.c
+ * @file src/plugins/fs/download.c
  * @brief code for downloading with gnunet-gtk
  * @author Christian Grothoff
  */
 
 #include "platform.h"
-#include "main.h"
-#include "fs.h"
+#include "download.h"
 #include "search.h"
 #include "helper.h"
 #include <extractor.h>

Modified: gnunet-gtk/src/plugins/fs/download.h
===================================================================
--- gnunet-gtk/src/plugins/fs/download.h        2005-07-04 23:36:52 UTC (rev 
1262)
+++ gnunet-gtk/src/plugins/fs/download.h        2005-07-04 23:45:28 UTC (rev 
1263)
@@ -27,7 +27,7 @@
 #ifndef GTK_DOWNLOAD_H
 #define GTK_DOWNLOAD_H
 
-#include "main.h"
+#include "helper.h"
 #include "fs.h"
 
 

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2005-07-04 23:36:52 UTC (rev 1262)
+++ gnunet-gtk/src/plugins/fs/search.c  2005-07-04 23:45:28 UTC (rev 1263)
@@ -27,7 +27,6 @@
 #include "platform.h"
 #include "search.h"
 #include "helper.h"
-#include "main.h"
 #include <extractor.h>
 
 /**

Modified: gnunet-gtk/src/plugins/fs/search.h
===================================================================
--- gnunet-gtk/src/plugins/fs/search.h  2005-07-04 23:36:52 UTC (rev 1262)
+++ gnunet-gtk/src/plugins/fs/search.h  2005-07-04 23:45:28 UTC (rev 1263)
@@ -27,7 +27,7 @@
 #ifndef GTK_SEARCH_H
 #define GTK_SEARCH_H
 
-#include "main.h"
+#include "helper.h"
 #include "fs.h"
 
 /**

Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c  2005-07-04 23:36:52 UTC (rev 1262)
+++ gnunet-gtk/src/plugins/fs/upload.c  2005-07-04 23:45:28 UTC (rev 1263)
@@ -26,8 +26,7 @@
 
 #include "platform.h"
 #include "search.h"
-#include "helper.h"
-#include "main.h"
+#include "upload.h"
 #include <extractor.h>
 
 #ifdef MINGW

Modified: gnunet-gtk/src/plugins/fs/upload.h
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.h  2005-07-04 23:36:52 UTC (rev 1262)
+++ gnunet-gtk/src/plugins/fs/upload.h  2005-07-04 23:45:28 UTC (rev 1263)
@@ -27,7 +27,7 @@
 #ifndef GTK_UPLOAD_H
 #define GTK_UPLOAD_H
 
-#include "main.h"
+#include "helper.h"
 #include "fs.h"
 
 /**