From 8022523767768598440bde06b0c1b719688c2e18 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 27 Jul 2006 15:22:13 +0000 Subject: [PATCH] cast the return value of XGetWindowProperty() correctly so we don't return 2006-07-27 Michael Natterer * gdk/x11/gdkwindow-x11.c (gdk_window_get_type_hint): cast the return value of XGetWindowProperty() correctly so we don't return garbage type hints. Pointed out by Tommi Komulainen, patch taken from https://maemo.org/bugzilla/show_bug.cgi?id=724 --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gdk/x11/gdkwindow-x11.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 654ceb3cfe..5d3d299382 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-07-27 Michael Natterer + + * gdk/x11/gdkwindow-x11.c (gdk_window_get_type_hint): cast the + return value of XGetWindowProperty() correctly so we don't return + garbage type hints. Pointed out by Tommi Komulainen, patch taken + from https://maemo.org/bugzilla/show_bug.cgi?id=724 + 2006-07-27 Matthias Clasen * gtk/gtksettings.c (gtk_settings_finalize): Move the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 654ceb3cfe..5d3d299382 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2006-07-27 Michael Natterer + + * gdk/x11/gdkwindow-x11.c (gdk_window_get_type_hint): cast the + return value of XGetWindowProperty() correctly so we don't return + garbage type hints. Pointed out by Tommi Komulainen, patch taken + from https://maemo.org/bugzilla/show_bug.cgi?id=724 + 2006-07-27 Matthias Clasen * gtk/gtksettings.c (gtk_settings_finalize): Move the diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 87324b7d2f..80f5ff3842 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -2322,7 +2322,7 @@ gdk_window_get_type_hint (GdkWindow *window) if ((type_return == XA_ATOM) && (format_return == 32) && (data) && (nitems_return == 1)) { - Atom atom = (Atom) *data; + Atom atom = *(Atom*)data; if (atom == gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DIALOG")) type = GDK_WINDOW_TYPE_HINT_DIALOG;