docu updaetsv0.11.0pre66

12 files changed, 32 insertions, 418 deletions

diff --git a/README b/README
index 5fe8309f..185fb13f 100644
--- a/README
+++ b/README
@@ -26,13 +26,13 @@ gnunet-gtk requires GTK 3.22.0 or higher and libgladeui-2 (i.e. 3.8 or
 After installation, you should have the following new programs:
 
 * gnunet-setup --- a GUI to configure GNUnet
-* gnunet-gtk (X11-systems only) --- meta-gui
 * gnunet-fs-gtk --- a GUI for file-sharing with GNUnet
 * gnunet-peerinfo-gtk --- a GUI for inspecting which
                           other peers your peer knows about
 * gnunet-namestore-gtk --- edit your GNS zones
 * gnunet-identity-gtk --- manage your identities/pseudonyms
 * gnunet-statistics-gtk --- visualize GNUnet statistics
+* gnunet-conversation-gtk --- talk with other users
 
 
 Stay tuned
diff --git a/configure.ac b/configure.ac
index 4ccbb544..8379d2a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -543,7 +543,6 @@ src/fs/Makefile
 src/fs/gnunet-fs-gtk.conf
 src/identity/Makefile
 src/peerinfo/Makefile
-src/main/Makefile
 src/namestore/Makefile
 src/setup/Makefile
 src/statistics/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2a382cf7..40bd0365 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,6 +2,7 @@
 SUBDIRS = . doxygen
 
 man_MANS = \
+  gnunet-conversation-gtk.1 \
   gnunet-fs-gtk.1 \
   gnunet-identity-gtk.1 \
   gnunet-namestore-gtk.1 \
diff --git a/doc/gnunet-conversation-gtk.1 b/doc/gnunet-conversation-gtk.1
new file mode 100644
index 00000000..6a21876c
--- /dev/null
+++ b/doc/gnunet-conversation-gtk.1
@@ -0,0 +1,29 @@
+.TH GNUNET-CONVERSATION-GTK "1" "5 May 2018" "GNUnet"
+.SH NAME
+gnunet\-conversation\-gtk \- a gtk interface for talking with other users
+.SH SYNOPSIS
+.B gnunet\-conversation\-gtk
+[\fIOPTIONS\fR]
+.SH DESCRIPTION
+.PP
+gnunet\-conversation\-gtk is a gtk+ based GUI for making conversation over GNUnet.  Users are addressed using the GNU Name System.  
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+print help page
+.TP
+\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
+load config file (default: ~/.config/gnunet.conf)
+.TP
+\fB\-s, \fB\-\-show-inactive\fR
+show peers even if we are not connected to them, have no (valid, non-expired) addresses for the peer, thus only know pretty much only their public keys; this will essentially list peers that we historically at some point encountered, but have currently no way to contact and that might not be running at all.
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+print the version number
+.SH FILES
+.TP
+~/.config/gnunet.conf
+User's GNUnet configuration file
+.SH "REPORTING BUGS"
+Report bugs by using mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet-developers@gnu.org>
+.SH "SEE ALSO"
+\fBgnunet\-setup\fP(1)
diff --git a/doc/gnunet-fs-gtk.1 b/doc/gnunet-fs-gtk.1
index 44b0af2a..ebe01feb 100644
--- a/doc/gnunet-fs-gtk.1
+++ b/doc/gnunet-fs-gtk.1
@@ -14,9 +14,6 @@ print help page
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 load config file (default: ~/.config/gnunet.conf)
 .TP
-\fB\-t, \fB\-\-tray\fR
-start with main window minimized (only put icon in tray)
-.TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number
 .SH NOTES
diff --git a/doc/gnunet-identity-gtk.1 b/doc/gnunet-identity-gtk.1
index 9d66c28e..e2c9d4c6 100644
--- a/doc/gnunet-identity-gtk.1
+++ b/doc/gnunet-identity-gtk.1
@@ -14,9 +14,6 @@ print help page
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 load config file (default: ~/.config/gnunet.conf)
 .TP
-\fB\-t, \fB\-\-tray\fR
-start with main window minimized (only put icon in tray)
-.TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number
 .SH FILES
diff --git a/doc/gnunet-namestore-gtk.1 b/doc/gnunet-namestore-gtk.1
index e22089ed..d14f34f6 100644
--- a/doc/gnunet-namestore-gtk.1
+++ b/doc/gnunet-namestore-gtk.1
@@ -14,9 +14,6 @@ print help page
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 load config file (default: ~/.config/gnunet.conf)
 .TP
-\fB\-t, \fB\-\-tray\fR
-start with main window minimized (only put icon in tray)
-.TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number
 .SH FILES
diff --git a/doc/gnunet-peerinfo-gtk.1 b/doc/gnunet-peerinfo-gtk.1
index 0119c60c..f68e702b 100644
--- a/doc/gnunet-peerinfo-gtk.1
+++ b/doc/gnunet-peerinfo-gtk.1
@@ -17,9 +17,6 @@ load config file (default: ~/.config/gnunet.conf)
 \fB\-s, \fB\-\-show-inactive\fR
 show peers even if we are not connected to them, have no (valid, non-expired) addresses for the peer, thus only know pretty much only their public keys; this will essentially list peers that we historically at some point encountered, but have currently no way to contact and that might not be running at all.
 .TP
-\fB\-t, \fB\-\-tray\fR
-start with main window minimized (only put icon in tray)
-.TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number
 .SH FILES
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d1a9041..4fefc153 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,2 @@
 # This Makefile.am is in the public domain
-SUBDIRS = . include lib $(GNUNET_FS_APP) $(GNUNET_SETUP_APP) $(GNUNET_PEERINFO_APP) $(GNUNET_CONVERSATION_APP) statistics identity namestore main
+SUBDIRS = . include lib $(GNUNET_FS_APP) $(GNUNET_SETUP_APP) $(GNUNET_PEERINFO_APP) $(GNUNET_CONVERSATION_APP) statistics identity namestore 
diff --git a/src/main/.gitignore b/src/main/.gitignore
deleted file mode 100644
index 59df402c..00000000
--- a/src/main/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gnunet-gtk
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
deleted file mode 100644
index d0139262..00000000
--- a/src/main/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-# This Makefile.am is in the public domain
-SUBDIRS = .
-
-AM_CPPFLAGS = \
-  -I$(top_srcdir)/ \
-  -I$(top_srcdir)/src/include
-
-bin_PROGRAMS = gnunet-gtk
-
-gnunet_gtk_SOURCES = \
-  gnunet-gtk.c
-
-gnunet_gtk_LDADD = \
-  $(top_builddir)/src/lib/libgnunetgtk.la \
-  @GTK_LIBS@ @GNUNET_LIBS@ @GLADE_LIBS@ \
-  $(WINLIBS) \
-  -lgnunetutil \
-  $(INTLLIBS)
-gnunet_gtk_CFLAGS = \
-  @GTK_CFLAGS@ \
-  @GNUNET_CFLAGS@ \
-  @GLADE_CFLAGS@
-gnunet_gtk_LDFLAGS = \
-  -export-dynamic
diff --git a/src/main/gnunet-gtk.c b/src/main/gnunet-gtk.c
deleted file mode 100644
index 68029152..00000000
--- a/src/main/gnunet-gtk.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2012-2014 GNUnet e.V.
-
-     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 3, 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., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
-*/
-
-/**
- * @file src/main/gnunet-gtk.c
- * @author Christian Grothoff
- * @brief Gtk user interface for GNUnet
- */
-#include "gnunet_gtk.h"
-#if HAVE_GTK_GTKX_H
-#include <gtk/gtkx.h>
-#endif
-
-/**
- * Handle for a plugged in process.
- */
-struct Plug
-{
-
-  /**
-   * Kept in a DLL.
-   */
-  struct Plug *prev;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct Plug *next;
-
-  /**
-   * The socket.
-   */
-  GtkWidget *s;
-
-  /**
-   * Name of the binary.
-   */
-  const char *binary;
-
-  /**
-   * Environment variable we set.
-   */
-  const char *env_var;
-
-  /**
-   * Handle to the child process.
-   */
-  struct GNUNET_OS_Process *proc;
-
-  /**
-   * How long do we wait on restarts?
-   */
-  struct GNUNET_TIME_Relative backoff;
-
-  /**
-   * Task to restart process after crash.
-   */
-  struct GNUNET_SCHEDULER_Task * restart_task;
-
-  /**
-   * ID of the signal associated with the window.
-   */
-  gulong sig_id;
-
-};
-
-
-/**
- * Main loop handle.
- */
-static struct GNUNET_GTK_MainLoop *ml;
-
-/**
- * Our configuration.
- */
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * Global return value (for success/failure of gnunet-gtk).
- */
-static int gret;
-
-/**
- * Head of plugs.
- */
-static struct Plug *p_head;
-
-/**
- * Tail of plugs.
- */
-static struct Plug *p_tail;
-
-
-/**
- * Get an object from the main window.
- *
- * @param name name of the object
- * @return NULL on error, otherwise the object
- */
-static GObject *
-get_object (const char *name)
-{
-  if (NULL == ml)
-    return NULL;
-  return GNUNET_GTK_main_loop_get_object (ml, name);
-}
-
-
-/**
- * Actual main to tear down the system.
- *
- * @param cls the main loop handle
- */
-static void
-cleanup_task (void *cls)
-{
-  struct Plug *p;
-
-  while (NULL != (p = p_head))
-  {
-    if (NULL != p->proc)
-    {
-      (void) GNUNET_OS_process_kill (p->proc,
-                                     SIGTERM);
-      GNUNET_break (GNUNET_OK ==
-                    GNUNET_OS_process_wait (p->proc));
-      GNUNET_OS_process_destroy (p->proc);
-      p->proc = NULL;
-    }
-    if (NULL != p->restart_task)
-    {
-      GNUNET_SCHEDULER_cancel (p->restart_task);
-      p->restart_task = NULL;
-    }
-    /* This object is long gone, as part of the cleanup
-       of the window from gtk_window_dispose that is
-       triggered with the shutdown; so we should not
-       do it here. (Keeping commented out to show
-       that there is symmetry with initialization --
-       kind-of) */
-    /* g_signal_handler_disconnect (p->s, p->sig_id); */
-    GNUNET_CONTAINER_DLL_remove (p_head,
-                                 p_tail,
-                                 p);
-    GNUNET_free (p);
-  }
-  if (NULL == ml)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GNUNET_GTK_main_loop_quit (ml);
-}
-
-
-/**
- * Callback invoked if the application is supposed to exit.
- */
-void
-gnunet_gtk_quit_cb (GObject * object,
-                    gpointer user_data)
-{
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-#ifdef GDK_WINDOWING_X11
-/**
- * Start the child process for the plug.
- *
- * @param p plug identification
- */
-static void
-start_process (struct Plug *p)
-{
-  char window_id[128];
-  Window w;
-
-  w = gtk_socket_get_id (GTK_SOCKET (p->s));
-  GNUNET_snprintf (window_id,
-                   sizeof (window_id),
-                   "%llu",
-                   (unsigned long long) w);
-  setenv (p->env_var, window_id, 1);
-  p->proc = GNUNET_OS_start_process (GNUNET_NO,
-                                     GNUNET_OS_INHERIT_STD_ALL,
-                                     NULL, NULL, NULL,
-                                     p->binary,
-                                     p->binary,
-                                     NULL);
-}
-
-
-/**
- * Restart crashed plugin process.
- *
- * @param cls the `struct Plug` of the plugin
- */
-static void
-restart_process (void *cls)
-{
-  struct Plug *p = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _("Restarting crashed plugin `%s'\n"),
-              p->binary);
-  p->restart_task = NULL;
-  start_process (p);
-}
-
-
-/**
- * The window got detached, restart the child.
- *
- * @param sock socket the plug got detached from
- * @param userdata our `struct Plug *`
- * @return TRUE (keep socket open)
- */
-static gboolean
-handle_remove (GtkSocket *sock,
-               gpointer userdata)
-{
-  struct Plug *p = userdata;
-
-  if (NULL != p->proc)
-  {
-    (void) GNUNET_OS_process_kill (p->proc, SIGTERM);
-    GNUNET_OS_process_destroy (p->proc);
-    p->proc = NULL;
-  }
-  p->backoff = GNUNET_TIME_STD_BACKOFF (p->backoff);
-  p->restart_task = GNUNET_SCHEDULER_add_delayed (p->backoff,
-                                                  &restart_process,
-                                                  p);
-  return TRUE;
-}
-
-
-/**
- * Embed process in our GUI.
- *
- * @param container where to embed
- * @param binary name of the binary to embed
- * @param env_var name of the environment variable to set
- */
-static void
-plug (const char *container,
-      const char *binary,
-      const char *env_var)
-{
-  GtkWidget *v;
-  GtkWidget *l;
-  struct Plug *p;
-  GtkNotebook *n;
-
-  p = GNUNET_new (struct Plug);
-  p->s = gtk_socket_new ();
-  gtk_widget_set_events (p->s,
-                         GDK_ALL_EVENTS_MASK);
-  n = GTK_NOTEBOOK (get_object ("gnunet_gtk_notebook"));
-  v = GTK_WIDGET (get_object (container));
-  l = gtk_notebook_get_tab_label (n, v);
-  /* remove old tab, replace with new tab; effectively,
-     we preserve the label; but GtkNotebook does not
-     allow us to directly substitute the body of the tab */
-  g_object_ref (l);
-  gtk_notebook_remove_page (n,
-                            gtk_notebook_page_num (n, v));
-  gtk_notebook_append_page (n, p->s, l);
-  g_object_unref (l);
-  p->binary = binary;
-  p->env_var = env_var;
-  p->sig_id = g_signal_connect (p->s,
-                                "plug-removed",
-                                G_CALLBACK (handle_remove),
-                                p);
-  start_process (p);
-  gtk_widget_show (p->s);
-  GNUNET_CONTAINER_DLL_insert (p_head,
-                               p_tail,
-                               p);
-}
-#endif
-
-
-/**
- * Actual main method that sets up the configuration window.
- *
- * @param cls the main loop handle
- */
-static void
-run (void *cls)
-{
-  GtkWidget *main_window;
-
-  ml = cls;
-  cfg = GNUNET_GTK_main_loop_get_configuration (ml);
-  if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
-    return;
-  GNUNET_GTK_set_icon_search_path ();
-  GNUNET_GTK_setup_nls ();
-  main_window = GTK_WIDGET (get_object ("gnunet_gtk_window"));
-  GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
-#ifdef GDK_WINDOWING_X11
-  plug ("gnunet_statistics_hbox",
-        "gnunet-statistics-gtk",
-        "GNUNET_STATISTICS_GTK_PLUG");
-  plug ("gnunet_peerinfo_hbox",
-        "gnunet-peerinfo-gtk",
-        "GNUNET_PEERINFO_GTK_PLUG");
-  plug ("gnunet_namestore_hbox",
-        "gnunet-namestore-gtk",
-        "GNUNET_NAMESTORE_GTK_PLUG");
-  plug ("gnunet_fs_hbox",
-        "gnunet-fs-gtk",
-        "GNUNET_FS_GTK_PLUG");
-  plug ("gnunet_identity_hbox",
-        "gnunet-identity-gtk",
-        "GNUNET_IDENTITY_GTK_PLUG");
-  plug ("gnunet_conversation_hbox",
-        "gnunet-conversation-gtk",
-        "GNUNET_CONVERSATION_GTK_PLUG");
-#if 0
-  plug ("gnunet_setup_hbox",
-        "gnunet-setup",
-        "GNUNET_SETUP_PLUG");
-#endif
-#endif
-  gtk_widget_show (main_window);
-  gtk_window_present (GTK_WINDOW (main_window));
-}
-
-
-/**
- * Main function for gnunet-gtk.
- *
- * @param argc number of arguments
- * @param argv arguments
- * @return 0 on success
- */
-int
-main (int argc, char *const *argv)
-{
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  int ret;
-
-  if (GNUNET_OK ==
-      GNUNET_GTK_main_loop_start ("gnunet-gtk",
-                                  "gnunet-gtk", argc, argv,
-                                  options, "gnunet_gtk.glade",
-                                  &run))
-    ret = gret;
-  else
-    ret = 1;
-  return ret;
-}
-
-
-/* end of gnunet-gtk.c */