[Xfce4-commits] <midori:master> Add gtk_widget_get_window and fix gtk_dialog_get_content_area

[Christian Dywan]

Updating branch refs/heads/master
         to a25e4c5f0ace96c91bb0d0b28f591f128f71e21d (commit)
       from 0533e67902d8ba6e4d40196324a12602aaf7d5b5 (commit)

commit a25e4c5f0ace96c91bb0d0b28f591f128f71e21d
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Apr 28 23:54:03 2010 +0200

    Add gtk_widget_get_window and fix gtk_dialog_get_content_area

 katze/katze-utils.c |    3 +++
 midori/sokoke.h     |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index b81868a..5416eb7 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 8ad6a8d..377a90b 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