diff options
author | Christian Grothoff <grothoff@gnunet.org> | 2022-01-24 09:09:55 +0100 |
---|---|---|
committer | Christian Grothoff <grothoff@gnunet.org> | 2022-01-24 09:09:55 +0100 |
commit | 3243fc32001a8b9ce54d7837ab6e4b4af382ff6a (patch) | |
tree | 745f47183b398f68ad2b4de5530f0c8b82509c01 | |
parent | d4118cff296f33d2c805ea5f2d7c405e68de0453 (diff) | |
download | gnunet-gtk-3243fc32001a8b9ce54d7837ab6e4b4af382ff6a.tar.gz gnunet-gtk-3243fc32001a8b9ce54d7837ab6e4b4af382ff6a.zip |
get rid of plug_me logik
-rw-r--r-- | src/fs/gnunet-fs-gtk.c | 2 | ||||
-rw-r--r-- | src/include/gnunet_gtk.h | 11 | ||||
-rw-r--r-- | src/lib/eventloop.c | 41 | ||||
-rw-r--r-- | src/namestore/gnunet-namestore-gtk.c | 1 | ||||
-rw-r--r-- | src/peerinfo/gnunet-peerinfo-gtk.c | 1 | ||||
-rw-r--r-- | src/setup/gnunet-setup.c | 1 | ||||
-rw-r--r-- | src/statistics/gnunet-statistics-gtk.c | 1 |
7 files changed, 0 insertions, 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) | |||
734 | "main_window_search_namespace_treestore")); | 734 | "main_window_search_namespace_treestore")); |
735 | main_context.main_window = GTK_WIDGET ( | 735 | main_context.main_window = GTK_WIDGET ( |
736 | GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_main_window")); | 736 | GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_main_window")); |
737 | main_context.main_window = | ||
738 | GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG", main_context.main_window); | ||
739 | main_context.ns_selector_treeview = GTK_TREE_VIEW ( | 737 | main_context.ns_selector_treeview = GTK_TREE_VIEW ( |
740 | GNUNET_FS_GTK_get_main_window_object ("namespace_selector_treeview")); | 738 | GNUNET_FS_GTK_get_main_window_object ("namespace_selector_treeview")); |
741 | main_context.ns_selector_window = GTK_WIDGET ( | 739 | 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; | |||
54 | 54 | ||
55 | /* ****************** Initialization *************** */ | 55 | /* ****************** Initialization *************** */ |
56 | 56 | ||
57 | /** | ||
58 | * If desired, enable plugging of this main window in the meta window. | ||
59 | * | ||
60 | * @param env_name environment variable to check | ||
61 | * @param main_window main window to plug | ||
62 | * @return new main window to initialize | ||
63 | */ | ||
64 | GtkWidget * | ||
65 | GNUNET_GTK_plug_me (const char *env_name, | ||
66 | GtkWidget *main_window); | ||
67 | |||
68 | 57 | ||
69 | /** | 58 | /** |
70 | * Initialize natural language support. | 59 | * 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 | |||
@@ -118,47 +118,6 @@ struct GNUNET_GTK_MainLoop | |||
118 | 118 | ||
119 | 119 | ||
120 | /** | 120 | /** |
121 | * If desired, enable plugging of this main window in the meta window. | ||
122 | * | ||
123 | * @param env_name environment variable to check | ||
124 | * @param main_window main window to plug | ||
125 | * @return new main window to initialize | ||
126 | */ | ||
127 | GtkWidget * | ||
128 | GNUNET_GTK_plug_me (const char *env_name, GtkWidget *main_window) | ||
129 | { | ||
130 | #if HAVE_GTK_GTKX_H | ||
131 | #ifdef GDK_WINDOWING_X11 | ||
132 | const char *plugid; | ||
133 | GtkWidget *plug; | ||
134 | GtkWidget *child; | ||
135 | unsigned long long id; | ||
136 | |||
137 | if (NULL == (plugid = getenv (env_name))) | ||
138 | return main_window; /* no plugging */ | ||
139 | if (1 != sscanf (plugid, "%llu", &id)) | ||
140 | { | ||
141 | fprintf (stderr, _ ("Invalid plug name `%s'\n"), plugid); | ||
142 | return main_window; | ||
143 | } | ||
144 | plug = gtk_plug_new ((Window) id); | ||
145 | child = gtk_bin_get_child (GTK_BIN (main_window)); | ||
146 | g_object_ref (child); | ||
147 | gtk_container_remove (GTK_CONTAINER (main_window), child); | ||
148 | gtk_container_add (GTK_CONTAINER (plug), child); | ||
149 | g_object_unref (child); | ||
150 | gtk_widget_destroy (main_window); | ||
151 | return plug; | ||
152 | #else | ||
153 | return main_window; | ||
154 | #endif | ||
155 | #else | ||
156 | return main_window; | ||
157 | #endif | ||
158 | } | ||
159 | |||
160 | |||
161 | /** | ||
162 | * Get the configuration. | 121 | * Get the configuration. |
163 | * | 122 | * |
164 | * @param ml handle to the main loop | 123 | * @param ml handle to the main loop |
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) | |||
3281 | GNUNET_GTK_setup_nls (); | 3281 | GNUNET_GTK_setup_nls (); |
3282 | 3282 | ||
3283 | main_window = GTK_WIDGET (get_object ("gnunet_namestore_gtk_dialog")); | 3283 | main_window = GTK_WIDGET (get_object ("gnunet_namestore_gtk_dialog")); |
3284 | main_window = GNUNET_GTK_plug_me ("GNUNET_NAMESTORE_GTK_PLUG", main_window); | ||
3285 | status_label = GTK_LABEL (get_object ("gnunet_namestore_gtk_status_label")); | 3284 | status_label = GTK_LABEL (get_object ("gnunet_namestore_gtk_status_label")); |
3286 | zone_combo_box = | 3285 | zone_combo_box = |
3287 | GTK_COMBO_BOX (get_object ("gnunet_namestore_gtk_zone_combobox")); | 3286 | 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) | |||
1592 | "GNUNET_PEERINFO_GTK_main_window_transport_connectivity_treeviewcolumn")); | 1592 | "GNUNET_PEERINFO_GTK_main_window_transport_connectivity_treeviewcolumn")); |
1593 | /* setup main window */ | 1593 | /* setup main window */ |
1594 | main_window = GTK_WIDGET (get_object ("GNUNET_PEERINFO_GTK_main_window")); | 1594 | main_window = GTK_WIDGET (get_object ("GNUNET_PEERINFO_GTK_main_window")); |
1595 | main_window = GNUNET_GTK_plug_me ("GNUNET_PEERINFO_GTK_PLUG", main_window); | ||
1596 | ts = GTK_TREE_STORE (get_object ("GNUNET_PEERINFO_GTK_tree_store")); | 1595 | ts = GTK_TREE_STORE (get_object ("GNUNET_PEERINFO_GTK_tree_store")); |
1597 | GNUNET_assert (NULL != ts); | 1596 | GNUNET_assert (NULL != ts); |
1598 | gtk_window_maximize (GTK_WINDOW (main_window)); | 1597 | 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) | |||
517 | } | 517 | } |
518 | } | 518 | } |
519 | main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog")); | 519 | main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog")); |
520 | main_window = GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG", main_window); | ||
521 | load_options (); | 520 | load_options (); |
522 | GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL); | 521 | GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL); |
523 | gtk_widget_show (main_window); | 522 | 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) | |||
256 | 256 | ||
257 | /* setup main window */ | 257 | /* setup main window */ |
258 | main_window = GTK_WIDGET (get_object ("GNUNET_STATISTICS_GTK_main_window")); | 258 | main_window = GTK_WIDGET (get_object ("GNUNET_STATISTICS_GTK_main_window")); |
259 | main_window = GNUNET_GTK_plug_me ("GNUNET_STATISTICS_GTK_PLUG", main_window); | ||
260 | gtk_window_maximize (GTK_WINDOW (main_window)); | 259 | gtk_window_maximize (GTK_WINDOW (main_window)); |
261 | create_plot ("GNUNET_STATISTICS_GTK_connectivity_box", connection_data); | 260 | create_plot ("GNUNET_STATISTICS_GTK_connectivity_box", connection_data); |
262 | create_plot ("GNUNET_STATISTICS_GTK_traffic_box", traffic_data); | 261 | create_plot ("GNUNET_STATISTICS_GTK_traffic_box", traffic_data); |