diff --git a/ChangeLog b/ChangeLog
index 499dadf7f..f50dcc9ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-07  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (meta_window_client_message): don't allow
+	shade/maximize/minimize for windows that don't support those
+	operations. (minimizing the panel = bad)
+
 2001-10-04  Havoc Pennington  <hp@pobox.com>
 
 	* src/keybindings.c (meta_change_keygrab): add code to grab all
diff --git a/src/keybindings.c b/src/keybindings.c
index 17fd72e5f..bf72f6d20 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -194,7 +194,7 @@ meta_change_keygrab (MetaDisplay *display,
       if (grab && result != Success)
         {
           const char *name;
-      
+          
           name = XKeysymToString (keysym);
           if (name == NULL)
             name = "(unknown)";
diff --git a/src/menu.c b/src/menu.c
index f96aafbca..72c1c86e6 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -257,10 +257,10 @@ meta_window_menu_new   (MetaFrames         *frames,
               MenuData *md;
 
               if (ops & META_MENU_OP_UNSTICK)
-                label = g_strdup_printf (_("Only on workspace _%d\n"),
+                label = g_strdup_printf (_("Only on workspace _%d"),
                                          i + 1);
               else
-                label = g_strdup_printf (_("Move to workspace _%d\n"),
+                label = g_strdup_printf (_("Move to workspace _%d"),
                                          i + 1);
           
               mi = gtk_menu_item_new_with_mnemonic (label);
diff --git a/src/window.c b/src/window.c
index c90299fb3..8d380f780 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2287,7 +2287,7 @@ meta_window_client_message (MetaWindow *window,
 
           shade = (action == _NET_WM_STATE_ADD ||
                    (action == _NET_WM_STATE_TOGGLE && !window->shaded));
-          if (shade)
+          if (shade && window->has_shade_func)
             meta_window_shade (window);
           else
             meta_window_unshade (window);
@@ -2302,7 +2302,7 @@ meta_window_client_message (MetaWindow *window,
 
           max = (action == _NET_WM_STATE_ADD ||
                  (action == _NET_WM_STATE_TOGGLE && !window->maximized));
-          if (max)
+          if (max && window->has_maximize_func)
             meta_window_maximize (window);
           else
             meta_window_unmaximize (window);
@@ -2346,7 +2346,8 @@ meta_window_client_message (MetaWindow *window,
     {
       meta_verbose ("WM_CHANGE_STATE client message, state: %ld\n",
                     event->xclient.data.l[0]);
-      if (event->xclient.data.l[0] == IconicState)
+      if (event->xclient.data.l[0] == IconicState &&
+          window->has_minimize_func)
         meta_window_minimize (window);
 
       return TRUE;
@@ -3549,7 +3550,7 @@ get_cardinal (MetaDisplay *display,
     return FALSE;
   
   if (type != XA_CARDINAL)
-    return FALSE;
+    return FALSE; /* FIXME free num ? */
 
   *val = *num;