diff options
| author | Neil Jagdish Patel <neil.patel@canonical.com> | 2010-08-21 12:26:06 +0100 |
|---|---|---|
| committer | Neil Jagdish Patel <neil.patel@canonical.com> | 2010-08-21 12:26:06 +0100 |
| commit | c8d348f6daf32301907652affadd2833b737f1a5 (patch) | |
| tree | 7621e7e6dce5b6faa62341ef49785d7ef7afabc2 /unity-private | |
| parent | 7dfd1b57e5606394f70dfeb610096395149ea8c2 (diff) | |
Add an error trap around the offending X call
Fixes LP: #621020 (bzr r451.1.1)
Diffstat (limited to 'unity-private')
| -rw-r--r-- | unity-private/unity-utils.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/unity-private/unity-utils.c b/unity-private/unity-utils.c index 2d5d2e758..56156af6d 100644 --- a/unity-private/unity-utils.c +++ b/unity-private/unity-utils.c @@ -66,15 +66,23 @@ utils_window_is_decorated (Window xid) gulong nitems; gulong bytes_after; gboolean retval; + gint ret = 0; hints_atom = gdk_x11_get_xatom_by_name_for_display (display, _XA_MOTIF_WM_HINTS); + gdk_error_trap_push (); XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), xid, hints_atom, 0, sizeof (MotifWmHints)/sizeof (long), False, AnyPropertyType, &type, &format, &nitems, &bytes_after, &data); + gdk_flush (); + if ((ret = gdk_error_trap_pop ())) + { + g_warning ("Unable to determine if window '%lu' is decorated: %d", + xid, ret); + } if (type == None || !data) { |