From 816a7c9b9e21dd51a151ee119784e7d28b340741 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 2 Mar 2012 11:57:00 +0000
Subject: -fixing compile errors on Gtk3

---
 src/fs/gnunet-fs-gtk.c                                |  1 -
 src/fs/gnunet-fs-gtk.h                                |  2 +-
 src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c |  5 -----
 src/fs/gnunet-fs-gtk_namespace_manager.c              | 17 ++++++++++++-----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index bbb94b13..6a39aa7a 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -26,7 +26,6 @@
 #include "gnunet-fs-gtk.h"
 #include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk_event-handler.h"
-#include <gdk/gdkkeysyms.h>
 
 /**
  * Should gnunet-fs-gtk start in tray mode?
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index 32b78d3d..5fe13213 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -56,7 +56,7 @@ struct GNUNET_GTK_MainWindowContext
   GtkTreeRowReference *ns_selector_pushed_row;
   GtkTreeRowReference *selected_ns_row;
   int ns_callback_registered;
-  GtkObject *ns_manager;
+  GtkWindow *ns_manager;
   gulong ns_manager_delete_handler_id;
 };
 
diff --git a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
index 3f5da1cd..dc2a0470 100644
--- a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
+++ b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
@@ -436,10 +436,5 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
   GNUNET_free_non_null (selected_ns_id);
 }
 
-void
-namespace_selector_manage_namespaces_button_clicked_cb (GtkButton *button, gpointer user_data)
-{
-  GNUNET_GTK_open_ns_manager (user_data);
-}
 
 /* end of gnunet-fs-gtk_main-window-namespace-dropdown.c */
diff --git a/src/fs/gnunet-fs-gtk_namespace_manager.c b/src/fs/gnunet-fs-gtk_namespace_manager.c
index 69fe4969..d40fb629 100644
--- a/src/fs/gnunet-fs-gtk_namespace_manager.c
+++ b/src/fs/gnunet-fs-gtk_namespace_manager.c
@@ -888,7 +888,7 @@ known_ns_selection_changed (GtkTreeSelection *treeselection,
   gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
 }
 
-GtkObject *
+GtkWindow *
 GNUNET_GTK_namespace_manager_open (struct GNUNET_GTK_MainWindowContext *main_ctx)
 {
   struct GNUNET_GTK_NamespaceManagerContext *ctx;
@@ -953,12 +953,12 @@ GNUNET_GTK_namespace_manager_open (struct GNUNET_GTK_MainWindowContext *main_ctx
   gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
 
   /* show dialog */
-  gtk_window_present (GTK_WINDOW (ctx->namespace_manager));
-  return GTK_OBJECT (ctx->namespace_manager);
+  gtk_window_present (ctx->namespace_manager);
+  return ctx->namespace_manager;
 }
 
 void
-ns_manager_deleted (GtkObject *object, gpointer user_data)
+ns_manager_deleted (GtkWindow *object, gpointer user_data)
 {
   struct GNUNET_GTK_MainWindowContext *ctx = user_data;
   g_signal_handler_disconnect (object, ctx->ns_manager_delete_handler_id);
@@ -973,7 +973,7 @@ GNUNET_GTK_open_ns_manager (struct GNUNET_GTK_MainWindowContext *ctx)
 {
   if (ctx->ns_manager != NULL)
   {
-    gtk_window_present (GTK_WINDOW (ctx->ns_manager));
+    gtk_window_present (ctx->ns_manager);
     return;
   }
 
@@ -992,4 +992,11 @@ GNUNET_GTK_main_menu_file_manage_pseudonyms_activate_cb (GtkMenuItem *menuitem,
   GNUNET_GTK_open_ns_manager (user_data);
 }
 
+void
+namespace_selector_manage_namespaces_button_clicked_cb (GtkButton *button, gpointer user_data)
+{
+  GNUNET_GTK_open_ns_manager (user_data);
+}
+
+
 /* end of gnunet-fs-gtk_namespace_manager.c */
-- 
cgit v1.2.3