[gimp/gtk3-port: 52/247] app: get rid of GtkObject and s/GDK_F1/GDK_KEY_F1/

[Michael Natterer <mitch src gnome org>]

commit aef28f4be04506760d3824870d3265d5d43847cf
Author: Michael Natterer <mitch gimp org>
Date:   Fri Oct 15 16:09:32 2010 +0200

    app: get rid of GtkObject and s/GDK_F1/GDK_KEY_F1/

 app/widgets/gimpuimanager.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/app/widgets/gimpuimanager.c b/app/widgets/gimpuimanager.c
index 55bb8de..ab21498 100644
--- a/app/widgets/gimpuimanager.c
+++ b/app/widgets/gimpuimanager.c
@@ -97,7 +97,7 @@ static void       gimp_ui_manager_menu_pos            (GtkMenu        *menu,
                                                        gint           *y,
                                                        gboolean       *push_in,
                                                        gpointer        data);
-static void       gimp_ui_manager_delete_popdown_data (GtkObject      *object,
+static void       gimp_ui_manager_delete_popdown_data (GObject        *object,
                                                        GimpUIManager  *manager);
 static void       gimp_ui_manager_item_realize        (GtkWidget      *widget,
                                                        GimpUIManager  *manager);
@@ -858,7 +858,7 @@ gimp_ui_manager_menu_pos (GtkMenu  *menu,
 }
 
 static void
-gimp_ui_manager_delete_popdown_data (GtkObject     *object,
+gimp_ui_manager_delete_popdown_data (GObject       *object,
                                      GimpUIManager *manager)
 {
   g_signal_handlers_disconnect_by_func (object,
@@ -1005,7 +1005,7 @@ gimp_ui_manager_item_key_press (GtkWidget     *widget,
    *  standard GtkMenuShell callback and assign a new shortcut, but
    *  don't assign a shortcut to the help menu entries ...
    */
-  if (kevent->keyval != GDK_F1)
+  if (kevent->keyval != GDK_KEY_F1)
     {
       if (help_id                                   &&
           gtk_accelerator_valid (kevent->keyval, 0) &&