Changeset 45319 in webkit

Timestamp:

Jun 27, 2009 10:54:40 PM (15 years ago)

Author:

jmalonzo@webkit.org

Message:

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):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/plugins/gtk/gtk2xtbin.c (modified) (5 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/GtkLauncher/main.c (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/WebCore/plugins/gtk/gtk2xtbin.c

@@ -43 +43 @@
  */
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "xembed.h"
 #include "gtk2xtbin.h"
@@ -247 +245 @@
   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);
@@ -320 +318 @@
 
   assert(parent_window != NULL);
-  xtbin = gtk_type_new (GTK_TYPE_XTBIN);
+  xtbin = g_object_new (GTK_TYPE_XTBIN, NULL);
 
   if (!xtbin)
@@ -378 +376 @@
     /* 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);
   }
@@ -496 +494 @@
       g_source_remove(tag);
 
-      gtk_timeout_remove(xt_polling_timer_id);
+      g_source_remove(xt_polling_timer_id);
       xt_polling_timer_id = 0;
     }

trunk/WebKitTools/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKitTools/GtkLauncher/main.c

@@ -141 +141 @@
     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);