[gnunet-gtk] branch master updated: get rid of plug_me logik

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet-gtk.

The following commit(s) were added to refs/heads/master by this push:
     new 3243fc32 get rid of plug_me logik
3243fc32 is described below

commit 3243fc32001a8b9ce54d7837ab6e4b4af382ff6a
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Mon Jan 24 09:09:55 2022 +0100

    get rid of plug_me logik
---
 src/fs/gnunet-fs-gtk.c                 |  2 --
 src/include/gnunet_gtk.h               | 11 ---------
 src/lib/eventloop.c                    | 41 ----------------------------------
 src/namestore/gnunet-namestore-gtk.c   |  1 -
 src/peerinfo/gnunet-peerinfo-gtk.c     |  1 -
 src/setup/gnunet-setup.c               |  1 -
 src/statistics/gnunet-statistics-gtk.c |  1 -
 7 files changed, 58 deletions(-)

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index bedefb1e..c30f4a29 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -734,8 +734,6 @@ run (void *cls)
                       "main_window_search_namespace_treestore"));
   main_context.main_window = GTK_WIDGET (
     GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_main_window"));
-  main_context.main_window =
-    GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG", main_context.main_window);
   main_context.ns_selector_treeview = GTK_TREE_VIEW (
     GNUNET_FS_GTK_get_main_window_object ("namespace_selector_treeview"));
   main_context.ns_selector_window = GTK_WIDGET (
diff --git a/src/include/gnunet_gtk.h b/src/include/gnunet_gtk.h
index b7370390..4be3138f 100644
--- a/src/include/gnunet_gtk.h
+++ b/src/include/gnunet_gtk.h
@@ -54,17 +54,6 @@ struct GNUNET_GTK_MainLoop;
 
 /* ****************** Initialization *************** */
 
-/**
- * If desired, enable plugging of this main window in the meta window.
- *
- * @param env_name environment variable to check
- * @param main_window main window to plug
- * @return new main window to initialize
- */
-GtkWidget *
-GNUNET_GTK_plug_me (const char *env_name,
-                    GtkWidget *main_window);
-
 
 /**
  * Initialize natural language support.
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 5dc971c1..7237f8f6 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -117,47 +117,6 @@ struct GNUNET_GTK_MainLoop
 };
 
 
-/**
- * If desired, enable plugging of this main window in the meta window.
- *
- * @param env_name environment variable to check
- * @param main_window main window to plug
- * @return new main window to initialize
- */
-GtkWidget *
-GNUNET_GTK_plug_me (const char *env_name, GtkWidget *main_window)
-{
-#if HAVE_GTK_GTKX_H
-#ifdef GDK_WINDOWING_X11
-  const char *plugid;
-  GtkWidget *plug;
-  GtkWidget *child;
-  unsigned long long id;
-
-  if (NULL == (plugid = getenv (env_name)))
-    return main_window; /* no plugging */
-  if (1 != sscanf (plugid, "%llu", &id))
-  {
-    fprintf (stderr, _ ("Invalid plug name `%s'\n"), plugid);
-    return main_window;
-  }
-  plug = gtk_plug_new ((Window) id);
-  child = gtk_bin_get_child (GTK_BIN (main_window));
-  g_object_ref (child);
-  gtk_container_remove (GTK_CONTAINER (main_window), child);
-  gtk_container_add (GTK_CONTAINER (plug), child);
-  g_object_unref (child);
-  gtk_widget_destroy (main_window);
-  return plug;
-#else
-  return main_window;
-#endif
-#else
-  return main_window;
-#endif
-}
-
-
 /**
  * Get the configuration.
  *
diff --git a/src/namestore/gnunet-namestore-gtk.c 
b/src/namestore/gnunet-namestore-gtk.c
index ea61d71f..ad5aa099 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -3281,7 +3281,6 @@ run (void *cls)
   GNUNET_GTK_setup_nls ();
 
   main_window = GTK_WIDGET (get_object ("gnunet_namestore_gtk_dialog"));
-  main_window = GNUNET_GTK_plug_me ("GNUNET_NAMESTORE_GTK_PLUG", main_window);
   status_label = GTK_LABEL (get_object ("gnunet_namestore_gtk_status_label"));
   zone_combo_box =
     GTK_COMBO_BOX (get_object ("gnunet_namestore_gtk_zone_combobox"));
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c 
b/src/peerinfo/gnunet-peerinfo-gtk.c
index 09e41991..c5c1b9b6 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -1592,7 +1592,6 @@ run (void *cts)
     "GNUNET_PEERINFO_GTK_main_window_transport_connectivity_treeviewcolumn"));
   /* setup main window */
   main_window = GTK_WIDGET (get_object ("GNUNET_PEERINFO_GTK_main_window"));
-  main_window = GNUNET_GTK_plug_me ("GNUNET_PEERINFO_GTK_PLUG", main_window);
   ts = GTK_TREE_STORE (get_object ("GNUNET_PEERINFO_GTK_tree_store"));
   GNUNET_assert (NULL != ts);
   gtk_window_maximize (GTK_WINDOW (main_window));
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 262645a1..7b5581f2 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -517,7 +517,6 @@ run (void *cls)
     }
   }
   main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
-  main_window = GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG", main_window);
   load_options ();
   GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
   gtk_widget_show (main_window);
diff --git a/src/statistics/gnunet-statistics-gtk.c 
b/src/statistics/gnunet-statistics-gtk.c
index 303b53f1..21ee3182 100644
--- a/src/statistics/gnunet-statistics-gtk.c
+++ b/src/statistics/gnunet-statistics-gtk.c
@@ -256,7 +256,6 @@ run (void *cls)
 
   /* setup main window */
   main_window = GTK_WIDGET (get_object ("GNUNET_STATISTICS_GTK_main_window"));
-  main_window = GNUNET_GTK_plug_me ("GNUNET_STATISTICS_GTK_PLUG", main_window);
   gtk_window_maximize (GTK_WINDOW (main_window));
   create_plot ("GNUNET_STATISTICS_GTK_connectivity_box", connection_data);
   create_plot ("GNUNET_STATISTICS_GTK_traffic_box", traffic_data);

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.