make gnunet-gtk work with gtk3 widgets

8 files changed, 32 insertions, 24 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 93d1c5e5..660b9df5 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -161,7 +161,7 @@ static void
 run (void *cls,
      const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GtkWindow *main_window;
+  GtkWidget *main_window;
 
   ml = cls;
   if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
@@ -169,24 +169,22 @@ run (void *cls,
   GNUNET_GTK_set_icon_search_path ();
   GNUNET_GTK_setup_nls ();
   /* setup main window */
-  main_window = GTK_WINDOW (GCG_get_main_window_object
+  main_window = GTK_WIDGET (GCG_get_main_window_object
                             ("gnunet_conversation_gtk_main_window"));
-  main_window =
-      GTK_WINDOW (GNUNET_GTK_plug_me
-                  ("GNUNET_CONVERSATION_GTK_PLUG",
-                   GTK_WIDGET (main_window)));
+  main_window = GNUNET_GTK_plug_me ("GNUNET_CONVERSATION_GTK_PLUG",
+                                    main_window);
+  gtk_window_maximize (GTK_WINDOW (main_window));
   if (NULL == getenv ("GNUNET_CONVERSATION_GTK_PLUG"))
-    GNUNET_GTK_tray_icon_create (ml, GTK_WINDOW (main_window),
-                                 "gnunet-conversation-gtk"
-                                 /* FIXME: different icon? */ ,
+    GNUNET_GTK_tray_icon_create (ml,
+                                 GTK_WINDOW (main_window),
+                                 "gnunet-gtk" /* FIXME: different icon? */,
                                  "gnunet-conversation-gtk");
   /* make GUI visible */
   if (! tray_only)
   {
-    gtk_widget_show (GTK_WIDGET (main_window));
+    gtk_widget_show (main_window);
     gtk_window_present (GTK_WINDOW (main_window));
   }
-
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 &shutdown_task,
                                 NULL);
diff --git a/src/conversation/gnunet-conversation-gtk_egos.c b/src/conversation/gnunet-conversation-gtk_egos.c
index 54c61acd..4c4d4a2f 100644
--- a/src/conversation/gnunet-conversation-gtk_egos.c
+++ b/src/conversation/gnunet-conversation-gtk_egos.c
@@ -61,6 +61,7 @@ static GtkListStore *ego_liststore;
  */
 static char *default_ego;
 
+
 /**
  * Obtain the currently selected ego.
  *
@@ -174,7 +175,7 @@ void
 gnunet_conversation_gtk_ego_copy_button_clicked_cb (GtkButton *button,
                                                     gpointer user_data)
 {
-  GNUNET_break (0);
+  GNUNET_break (0); // FIXME: not implemented
 }
 
 
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index ec397b7c..f9c2f858 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -426,7 +426,9 @@ unique_app_message_cb (UniqueApp *app,
   struct GNUNET_GTK_MainWindowContext *main_context = user_data;
 
   /* raise the window */
-  gtk_window_present_with_time (GTK_WINDOW (main_context->main_window), time_);
+  if (GTK_IS_WINDOW (main_context->main_window))
+    gtk_window_present_with_time (GTK_WINDOW (main_context->main_window),
+                                  time_);
 
   switch (command)
     {
@@ -720,7 +722,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   main_context.download_anonymity_combo = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ("main_window_download_anonymity_combobox"));
   main_context.download_recursive_checkbutton = GTK_CHECK_BUTTON (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_search_frame_download_recursive_checkbox"));
   main_context.download_download_button = GTK_BUTTON (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_search_frame_download_download_button"));
-  main_context.download_panel = GTK_VBOX (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_search_frame_download_vbox"));
+  main_context.download_panel = GTK_BOX (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_search_frame_download_vbox"));
 
   main_context.notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_main_window_notebook"));
 
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index 3dab8bcf..20a564db 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -203,7 +203,7 @@ struct GNUNET_GTK_MainWindowContext
   GtkComboBox *download_anonymity_combo;
   GtkCheckButton *download_recursive_checkbutton;
   GtkButton *download_download_button;
-  GtkVBox *download_panel;
+  GtkBox *download_panel;
 
   GtkNotebook *notebook;
 
diff --git a/src/include/gnunet_gtk.h b/src/include/gnunet_gtk.h
index 4603343a..74fdc3b2 100644
--- a/src/include/gnunet_gtk.h
+++ b/src/include/gnunet_gtk.h
@@ -167,8 +167,10 @@ GNUNET_GTK_get_tree_string (GtkTreeView * treeview, GtkTreePath * treepath,
  * @param tooltip tooltip for the tray icon
  */
 void
-GNUNET_GTK_tray_icon_create (struct GNUNET_GTK_MainLoop *ml, GtkWindow * main,
-                             const char *icon_name, const char *tooltip);
+GNUNET_GTK_tray_icon_create (struct GNUNET_GTK_MainLoop *ml,
+                             GtkWindow *main,
+                             const char *icon_name,
+                             const char *tooltip);
 
 /**
  * Change our tray icon.
diff --git a/src/lib/trayicon.c b/src/lib/trayicon.c
index 4e9c14db..d2e49493 100644
--- a/src/lib/trayicon.c
+++ b/src/lib/trayicon.c
@@ -161,10 +161,7 @@ GNUNET_GTK_tray_icon_change (const char *icon_name,
                              const char *tooltip)
 {
   if (NULL == tray_icon)
-  {
-    GNUNET_break (0);
     return;
-  }
   gtk_status_icon_set_from_icon_name (tray_icon, icon_name);
   gtk_status_icon_set_tooltip_text (tray_icon, tooltip);
   gtk_status_icon_set_visible (tray_icon, TRUE);
diff --git a/src/main/gnunet-gtk.c b/src/main/gnunet-gtk.c
index 68ef7e68..842b15ef 100644
--- a/src/main/gnunet-gtk.c
+++ b/src/main/gnunet-gtk.c
@@ -263,15 +263,23 @@ plug (const char *container,
       const char *binary,
       const char *env_var)
 {
-  GtkContainer *v;
+  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);
-  v = GTK_CONTAINER (get_object (container));
-  gtk_container_add (v, p->s);
+  n = GTK_NOTEBOOK (get_object ("gnunet_gtk_notebook"));
+  v = GTK_WIDGET (get_object (container));
+  l = gtk_notebook_get_tab_label (n, v);
+  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,
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index 97e166e2..d0c50b80 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -1530,7 +1530,7 @@ run (void *cts,
   if (NULL == getenv ("GNUNET_PEERINFO_GTK_PLUG"))
     GNUNET_GTK_tray_icon_create (ml,
                                  GTK_WINDOW (main_window),
-                                 "gnunet-gtk" /* FIXME: different icon? */ ,
+                                 "gnunet-gtk" /* FIXME: different icon? */,
                                  "gnunet-peerinfo-gtk");
 
   tv = GTK_TREE_VIEW (get_object ("GNUNET_PEERINFO_GTK_main_window_treeview"));