remove the kde icon hint, they use the EWMH icon now

diff --git a/openbox/client.c b/openbox/client.c
index fff9bdd5ef0f7a9d9bfddbe03641fcc10ca10d36..27e63292931b0ed422149c7a40e900f0f02f2aaa 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1775,23 +1775,6 @@ void client_update_icons(ObClient *self)
             g_assert(i <= num);
         }
 
-        g_free(data);
-    } else if (PROP_GETA32(self->window, kwm_win_icon,
-                           kwm_win_icon, &data, &num)) {
-        if (num == 2) {
-            self->nicons++;
-            self->icons = g_new(ObClientIcon, self->nicons);
-            xerror_set_ignore(TRUE);
-            if (!RrPixmapToRGBA(ob_rr_inst,
-                                data[0], data[1],
-                                &self->icons[self->nicons-1].width,
-                                &self->icons[self->nicons-1].height,
-                                &self->icons[self->nicons-1].data)) {
-                g_free(&self->icons[self->nicons-1]);
-                self->nicons--;
-            }
-            xerror_set_ignore(FALSE);
-        }
         g_free(data);
     } else {
         XWMHints *hints;

diff --git a/openbox/event.c b/openbox/event.c
index 2c243882a079b71b57ee2b32f247d73ed245e717..558872e85784b26e7a8fae24a62a69598c9f0ea7 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1110,11 +1110,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
                  b == prop_atoms.wm_icon_name)) {
                 continue;
             }
-            if ((a == prop_atoms.net_wm_icon ||
-                 a == prop_atoms.kwm_win_icon)
-                &&
-                (b == prop_atoms.net_wm_icon ||
-                 b == prop_atoms.kwm_win_icon))
+            if (a == prop_atoms.net_wm_icon &&
+                b == prop_atoms.net_wm_icon)
                 continue;
 
             XPutBackEvent(ob_display, &ce);
@@ -1148,8 +1145,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
         else if (msgtype == prop_atoms.net_wm_strut) {
             client_update_strut(client);
         }
-        else if (msgtype == prop_atoms.net_wm_icon ||
-                 msgtype == prop_atoms.kwm_win_icon) {
+        else if (msgtype == prop_atoms.net_wm_icon) {
             client_update_icons(client);
         }
         else if (msgtype == prop_atoms.sm_client_id) {

diff --git a/openbox/prop.c b/openbox/prop.c
index 5d64202dd592775e6ba8c41238037c7d9142ef3a..977dbe957e6af204988c2bed44643b5bb88aff37 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -146,8 +146,6 @@ void prop_startup()
     CREATE(kde_wm_change_state, "_KDE_WM_CHANGE_STATE");
     CREATE(kde_net_wm_window_type_override,"_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
 
-    CREATE(kwm_win_icon, "KWM_WIN_ICON");
-  
     CREATE(rootpmapid, "_XROOTPMAP_ID");
     CREATE(esetrootid, "ESETROOT_PMAP_ID");
 

diff --git a/openbox/prop.h b/openbox/prop.h
index 681b804e348c52def66a94a269175c4aae173e7f..2c36b624f2b71d81410a3a09dfc03241864e0cfc 100644 (file)
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -158,8 +158,6 @@ typedef struct Atoms {
     Atom kde_wm_change_state;
     Atom kde_net_wm_window_type_override;
 
-    Atom kwm_win_icon;
-
     Atom rootpmapid;
     Atom esetrootid;