Add gtk_widget_get_window and fix gtk_dialog_get_content_area

diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index b81868ae195c667324eb2347a65cae17b9a1078f..5416eb7bce6323694880eb89646e69184cc7d960 100644 (file)
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -29,6 +29,9 @@
     #include <hildon/hildon.h>
 #endif
 
+#if !GTK_CHECK_VERSION (2, 14, 0)
+    #define gtk_widget_get_window(wdgt) wdgt->window
+#endif
 #if !GTK_CHECK_VERSION (2, 18, 0)
     #define gtk_widget_get_has_window(wdgt) !GTK_WIDGET_NO_WINDOW (wdgt)
     #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation

diff --git a/midori/sokoke.h b/midori/sokoke.h
index 8ad6a8d07d50a46ea36aee3041e6827b183ba8ac..377a90be14042a11a107707129bfe99bf391078c 100644 (file)
--- a/midori/sokoke.h
+++ b/midori/sokoke.h
@@ -27,6 +27,9 @@
 #if !GLIB_CHECK_VERSION (2, 14, 0)
     #define G_PARAM_STATIC_STRINGS \
     (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
+#endif
+
+#if !GTK_CHECK_VERSION (2, 14, 0)
     #define gtk_dialog_get_content_area(dlg) dlg->vbox
 #endif