[GNUnet-SVN] r20200 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2012-03-02 12:57:00 +0100 (Fri, 02 Mar 2012)
New Revision: 20200

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
   gnunet-gtk/src/fs/gnunet-fs-gtk.h
   gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c
Log:
-fixing compile errors on Gtk3

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2012-03-02 11:54:44 UTC (rev 20199)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2012-03-02 11:57:00 UTC (rev 20200)
@@ -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?

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.h   2012-03-02 11:54:44 UTC (rev 20199)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.h   2012-03-02 11:57:00 UTC (rev 20200)
@@ -56,7 +56,7 @@
   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;
 };
 

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c    
2012-03-02 11:54:44 UTC (rev 20199)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c    
2012-03-02 11:57:00 UTC (rev 20200)
@@ -436,10 +436,5 @@
   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 */

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c 2012-03-02 11:54:44 UTC 
(rev 20199)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_namespace_manager.c 2012-03-02 11:57:00 UTC 
(rev 20200)
@@ -888,7 +888,7 @@
   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 @@
   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 @@
 {
   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_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 */