watch out for 0x0 icons, and skip them

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 044098fc9a5836e30aaa2970a75eaef39fb460df..a1ad36e0e5fe69b06b78a399cbc80b78eec314ec 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1,5 +1,6 @@
 #include "openbox.h"
 #include "dock.h"
+#include "xerror.h"
 #include "prop.h"
 #include "startup.h"
 #include "timer.h"
@@ -91,7 +92,7 @@ gboolean screen_annex()
     PROP_SET32(ob_root, net_supporting_wm_check, window, support_window);
 
     /* set properties on the supporting window */
-    PROP_SETS(support_window, net_wm_name, "Openbox");
+    PROP_SETS(support_window, net_wm_name, "Openbox3");
     PROP_SET32(support_window, net_supporting_wm_check, window,support_window);
 
     /* set the _NET_SUPPORTED_ATOMS hint */
@@ -487,10 +488,12 @@ void screen_install_colormap(Client *client, gboolean install)
     } else {
        if (XGetWindowAttributes(ob_display, client->window, &wa) &&
             wa.colormap != None) {
+            xerror_set_ignore(TRUE);
            if (install)
                XInstallColormap(ob_display, wa.colormap);
            else
                XUninstallColormap(ob_display, wa.colormap);
+            xerror_set_ignore(FALSE);
        }
     }
 }