aboutsummaryrefslogtreecommitdiffstats
path: root/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-06-30 08:19:37 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-06-30 08:19:37 +0000
commitc8e5702127e507e82e6f68a4b8c546803accea9d (patch)
tree00583491f40ecc640f2b28452af995e3a63a09d7 /packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff
parent87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff)
downloadopenembedded-c8e5702127e507e82e6f68a4b8c546803accea9d.tar.gz
openembedded-c8e5702127e507e82e6f68a4b8c546803accea9d.tar.bz2
openembedded-c8e5702127e507e82e6f68a4b8c546803accea9d.zip
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff')
-rw-r--r--packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff38
1 files changed, 38 insertions, 0 deletions
diff --git a/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff b/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff
index e69de29bb2..8104eb8559 100644
--- a/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff
+++ b/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff
@@ -0,0 +1,38 @@
+--- gtk+-2.6.4/gdk/x11/gdkwindow-x11.c 2005-01-25 20:51:36.000000000 +0200
++++ gtk+-2.6.4/gdk/x11/gdkwindow-x11.c 2005-04-06 16:19:35.350164320 +0300
+@@ -1286,6 +1286,7 @@
+ GdkToplevelX11 *toplevel;
+ Atom atoms[7];
+ gint i;
++ gint propmode;
+
+ private = (GdkWindowObject*) window;
+ toplevel = _gdk_x11_window_get_toplevel (window);
+@@ -1295,6 +1296,12 @@
+
+ update_wm_hints (window, TRUE);
+
++ /* If the window has _NET_WM_STATE key specified, use it as the property mode */
++ propmode = (gint)g_object_get_data (G_OBJECT (window), "_NET_WM_STATE");
++
++ if (!propmode)
++ propmode = PropModeReplace;
++
+ /* We set the spec hints regardless of whether the spec is supported,
+ * since it can't hurt and it's kind of expensive to check whether
+ * it's supported.
+@@ -1366,10 +1373,11 @@
+ XChangeProperty (xdisplay,
+ xwindow,
+ gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"),
+- XA_ATOM, 32, PropModeReplace,
++ XA_ATOM, 32, propmode,
+ (guchar*) atoms, i);
+- }
+- else
++ }
++ /* Don't delete the property, unless we are replacing it */
++ else if (propmode == PropModeReplace )
+ {
+ XDeleteProperty (xdisplay,
+ xwindow,