summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Thurman <thomas@thurman.org.uk>2007-07-31 12:20:14 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2007-07-31 12:20:14 +0000
commitcd07c257060b899bc939d8dd02a930773a486da6 (patch)
treed2346c29397311cd0d14891fbb3329eafd81253e
parent3802f157b6521222da153400f7320ba4f9532d99 (diff)
downloadmetacity-cd07c257060b899bc939d8dd02a930773a486da6.tar.gz
windows which are always on top have the "stick" menu option insensitive.
2007-06-31 Thomas Thurman <thomas@thurman.org.uk> * src/window.c (meta_window_show_menu): windows which are always on top have the "stick" menu option insensitive. (#460997). svn path=/trunk/; revision=3282
-rw-r--r--ChangeLog5
-rw-r--r--src/window.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a34718c7..8613df87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-31 Thomas Thurman <thomas@thurman.org.uk>
+
+ * src/window.c (meta_window_show_menu): windows which are
+ always on top have the "stick" menu option insensitive. (#460997).
+
2007-06-23 Thomas Thurman <thomas@thurman.org.uk>
* src/window.h (MetaWindow): Put all bitfields together to
diff --git a/src/window.c b/src/window.c
index 064c8f56..71b28125 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6504,7 +6504,7 @@ meta_window_show_menu (MetaWindow *window,
insensitive |= META_MENU_OP_RESIZE;
if (window->always_sticky)
- insensitive |= META_MENU_OP_UNSTICK | META_MENU_OP_WORKSPACES;
+ insensitive |= META_MENU_OP_STICK | META_MENU_OP_UNSTICK | META_MENU_OP_WORKSPACES;
if ((window->type == META_WINDOW_DESKTOP) ||
(window->type == META_WINDOW_DOCK) ||