diff options
author | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
commit | b2f192faabe412adce79534e22efe9fb69ee40e2 (patch) | |
tree | 7076c49d4286f8a1733650bd8fbc7161af200d57 /meta/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff | |
parent | 2cf0eadf9f730027833af802d7e6c90b44248f80 (diff) | |
download | poky-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz |
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff b/meta/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff new file mode 100644 index 0000000000..8104eb8559 --- /dev/null +++ b/meta/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff | |||
@@ -0,0 +1,38 @@ | |||
1 | --- gtk+-2.6.4/gdk/x11/gdkwindow-x11.c 2005-01-25 20:51:36.000000000 +0200 | ||
2 | +++ gtk+-2.6.4/gdk/x11/gdkwindow-x11.c 2005-04-06 16:19:35.350164320 +0300 | ||
3 | @@ -1286,6 +1286,7 @@ | ||
4 | GdkToplevelX11 *toplevel; | ||
5 | Atom atoms[7]; | ||
6 | gint i; | ||
7 | + gint propmode; | ||
8 | |||
9 | private = (GdkWindowObject*) window; | ||
10 | toplevel = _gdk_x11_window_get_toplevel (window); | ||
11 | @@ -1295,6 +1296,12 @@ | ||
12 | |||
13 | update_wm_hints (window, TRUE); | ||
14 | |||
15 | + /* If the window has _NET_WM_STATE key specified, use it as the property mode */ | ||
16 | + propmode = (gint)g_object_get_data (G_OBJECT (window), "_NET_WM_STATE"); | ||
17 | + | ||
18 | + if (!propmode) | ||
19 | + propmode = PropModeReplace; | ||
20 | + | ||
21 | /* We set the spec hints regardless of whether the spec is supported, | ||
22 | * since it can't hurt and it's kind of expensive to check whether | ||
23 | * it's supported. | ||
24 | @@ -1366,10 +1373,11 @@ | ||
25 | XChangeProperty (xdisplay, | ||
26 | xwindow, | ||
27 | gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"), | ||
28 | - XA_ATOM, 32, PropModeReplace, | ||
29 | + XA_ATOM, 32, propmode, | ||
30 | (guchar*) atoms, i); | ||
31 | - } | ||
32 | - else | ||
33 | + } | ||
34 | + /* Don't delete the property, unless we are replacing it */ | ||
35 | + else if (propmode == PropModeReplace ) | ||
36 | { | ||
37 | XDeleteProperty (xdisplay, | ||
38 | xwindow, | ||