summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Klapper <a9016009@gmx.de>2010-05-10 19:57:01 +0200
committerThomas Thurman <tthurman@gnome.org>2010-06-10 23:59:02 -0400
commit4a1ef32503a6ed0a378269a22f2d2d7fc90c668e (patch)
treed516a8872dd0fe377c6cd0a3476f323d8805890a
parent069ca9f80568a5d05653ff364b11c3267c78dc60 (diff)
downloadmetacity-4a1ef32503a6ed0a378269a22f2d2d7fc90c668e.tar.gz
metacity-4a1ef32503a6ed0a378269a22f2d2d7fc90c668e.tar.bz2
Make METACITY_WINDOW_DEMO compile with -DGSEAL_ENABLE. See bug 612491.
-rw-r--r--configure.in2
-rw-r--r--src/tools/metacity-window-demo.c24
2 files changed, 13 insertions, 13 deletions
diff --git a/configure.in b/configure.in
index 364dff8..f5e3c93 100644
--- a/configure.in
+++ b/configure.in
@@ -168,7 +168,7 @@ AM_GLIB_GNU_GETTEXT
PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.6.0)
# gtk_window_set_icon_name requires gtk2+-2.60
PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.6.0)
-PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.6.0)
+PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.19.7)
if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
echo "pangoxft found"
diff --git a/src/tools/metacity-window-demo.c b/src/tools/metacity-window-demo.c
index 86c212b..03b5d9a 100644
--- a/src/tools/metacity-window-demo.c
+++ b/src/tools/metacity-window-demo.c
@@ -67,14 +67,14 @@ on_realize_set_struts (GtkWindow *window,
int top;
int bottom;
- g_return_if_fail (GTK_WIDGET_REALIZED (window));
+ g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window)));
left = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "meta-strut-left"));
right = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "meta-strut-right"));
top = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "meta-strut-top"));
bottom = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "meta-strut-bottom"));
- set_gdk_window_struts (GTK_WIDGET (window)->window,
+ set_gdk_window_struts (gtk_widget_get_window (GTK_WIDGET (window)),
left, right, top, bottom);
}
@@ -103,8 +103,8 @@ set_gtk_window_struts (GtkWidget *window,
G_CALLBACK (on_realize_set_struts),
NULL);
- if (GTK_WIDGET_REALIZED (window))
- set_gdk_window_struts (GTK_WIDGET (window)->window,
+ if (gtk_widget_get_realized (GTK_WIDGET (window)))
+ set_gdk_window_struts (gtk_widget_get_window (GTK_WIDGET (window)),
left, right, top, bottom);
}
@@ -131,13 +131,13 @@ on_realize_set_type (GtkWindow *window,
{
const char *type;
- g_return_if_fail (GTK_WIDGET_REALIZED (window));
+ g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window)));
type = g_object_get_data (G_OBJECT (window), "meta-window-type");
g_return_if_fail (type != NULL);
- set_gdk_window_type (GTK_WIDGET (window)->window,
+ set_gdk_window_type (gtk_widget_get_window (GTK_WIDGET (window)),
type);
}
@@ -156,8 +156,8 @@ set_gtk_window_type (GtkWindow *window,
G_CALLBACK (on_realize_set_type),
NULL);
- if (GTK_WIDGET_REALIZED (window))
- set_gdk_window_type (GTK_WIDGET (window)->window,
+ if (gtk_widget_get_realized (GTK_WIDGET (window)))
+ set_gdk_window_type (gtk_widget_get_window (GTK_WIDGET (window)),
type);
}
@@ -171,9 +171,9 @@ static void
on_realize_set_border_only (GtkWindow *window,
gpointer data)
{
- g_return_if_fail (GTK_WIDGET_REALIZED (window));
+ g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window)));
- set_gdk_window_border_only (GTK_WIDGET (window)->window);
+ set_gdk_window_border_only (gtk_widget_get_window (GTK_WIDGET (window)));
}
static void
@@ -188,8 +188,8 @@ set_gtk_window_border_only (GtkWindow *window)
G_CALLBACK (on_realize_set_border_only),
NULL);
- if (GTK_WIDGET_REALIZED (window))
- set_gdk_window_border_only (GTK_WIDGET (window)->window);
+ if (gtk_widget_get_realized (GTK_WIDGET (window)))
+ set_gdk_window_border_only (gtk_widget_get_window (GTK_WIDGET (window)));
}
int