diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-09-02 11:50:01 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-09-02 11:50:01 +0000 |
| commit | 95efeafc86f47592b37c44f2f7314324cc04250d (patch) | |
| tree | e60fe38e88d8e6cf42cf1311c5ada752b79a59c7 /openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff | |
| parent | 7755d9d194b42ea859096f805f2e22ae5b6e6281 (diff) | |
| download | openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.gz openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.bz2 openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.xz openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.zip | |
Add gtk+, avahi, dbus-0.34 (.36 coming soon) and dependencies. Fix x11-common breakage.
git-svn-id: https://svn.o-hand.com/repos/poky@13 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff')
| -rw-r--r-- | openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gdkwindow-x11.c.diff new file mode 100644 index 000000000..8104eb855 --- /dev/null +++ b/openembedded/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, |