2009-06-27 Emilio Pozuelo Monfort <pochu27@gmail.com>

        Reviewed by Jan Alonzo.

        [GTK] Don't use deprecated GTK+ symbols.
        https://bugs.webkit.org/show_bug.cgi?id=26583

        * plugins/gtk/gtk2xtbin.c:
        (gtk_xtbin_class_init):
        (gtk_xtbin_new):
        (gtk_xtbin_destroy):
        * GtkLauncher/main.c:
        (create_toolbar):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@45319 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b7a50c6..d8dfad1 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-06-27  Emilio Pozuelo Monfort  <pochu27@gmail.com>
+
+        Reviewed by Jan Alonzo.
+
+        [GTK] Don't use deprecated GTK+ symbols.
+        https://bugs.webkit.org/show_bug.cgi?id=26583
+
+        * plugins/gtk/gtk2xtbin.c:
+        (gtk_xtbin_class_init):
+        (gtk_xtbin_new):
+        (gtk_xtbin_destroy):
+
 2009-06-27  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Dan Bernstein.

diff --git a/WebCore/plugins/gtk/gtk2xtbin.c b/WebCore/plugins/gtk/gtk2xtbin.c
index 8d52aa2..68c5373 100644 (file)
--- a/WebCore/plugins/gtk/gtk2xtbin.c
+++ b/WebCore/plugins/gtk/gtk2xtbin.c
@@ -42,8 +42,6 @@
  * inside a GTK application.  
  */
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "xembed.h"
 #include "gtk2xtbin.h"
 #include <gtk/gtk.h>
@@ -246,7 +244,7 @@ gtk_xtbin_class_init (GtkXtBinClass *klass)
   GtkWidgetClass *widget_class;
   GtkObjectClass *object_class;
 
-  parent_class = gtk_type_class (GTK_TYPE_SOCKET);
+  parent_class = g_type_class_peek_parent (klass);
 
   widget_class = GTK_WIDGET_CLASS (klass);
   widget_class->realize = gtk_xtbin_realize;
@@ -319,7 +317,7 @@ gtk_xtbin_new (GdkWindow *parent_window, String * f)
   gpointer user_data;
 
   assert(parent_window != NULL);
-  xtbin = gtk_type_new (GTK_TYPE_XTBIN);
+  xtbin = g_object_new (GTK_TYPE_XTBIN, NULL);
 
   if (!xtbin)
     return (GtkWidget*)NULL;
@@ -377,8 +375,8 @@ gtk_xtbin_new (GdkWindow *parent_window, String * f)
                              G_PRIORITY_LOW);
     /* add a timer so that we can poll and process Xt timers */
     xt_polling_timer_id =
-      gtk_timeout_add(25,
-                      (GtkFunction)xt_event_polling_timer_callback,
+      g_timeout_add(25,
+                      (GSourceFunc)xt_event_polling_timer_callback,
                       xtdisplay);
   }
 
@@ -495,7 +493,7 @@ gtk_xtbin_destroy (GtkObject *object)
       g_main_context_remove_poll((GMainContext*)NULL, &xt_event_poll_fd);
       g_source_remove(tag);
 
-      gtk_timeout_remove(xt_polling_timer_id);
+      g_source_remove(xt_polling_timer_id);
       xt_polling_timer_id = 0;
     }
   }

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9c8d0e2..80071f7 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-06-27  Emilio Pozuelo Monfort  <pochu27@gmail.com>
+
+        Reviewed by Jan Alonzo.
+
+        [GTK] Don't use deprecated GTK+ symbols.
+        https://bugs.webkit.org/show_bug.cgi?id=26583
+
+        * GtkLauncher/main.c:
+        (create_toolbar):
+
 2009-06-26  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/WebKitTools/GtkLauncher/main.c b/WebKitTools/GtkLauncher/main.c
index 48ba97e..063b1cb 100644 (file)
--- a/WebKitTools/GtkLauncher/main.c
+++ b/WebKitTools/GtkLauncher/main.c
@@ -140,7 +140,7 @@ create_toolbar ()
 {
     GtkWidget* toolbar = gtk_toolbar_new ();
 
-    gtk_toolbar_set_orientation (GTK_TOOLBAR (toolbar), GTK_ORIENTATION_HORIZONTAL);
+    gtk_orientable_set_orientation (GTK_ORIENTABLE (toolbar), GTK_ORIENTATION_HORIZONTAL);
     gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
 
     GtkToolItem* item;