From: Christian Dywan <christian@twotoasts.de>
Date: Wed, 28 Apr 2010 21:54:03 +0000 (+0200)
Subject: Add gtk_widget_get_window and fix gtk_dialog_get_content_area
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a25e4c5f0ace96c91bb0d0b28f591f128f71e21d;p=midori

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 b81868ae..5416eb7b 100644
--- 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 8ad6a8d0..377a90be 100644
--- 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