X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=900cb9438de372ae926eb535a50bdb08851f51e8;hb=d6cb5adbeaf0b7fbb55aca942ae5b8f62f77b4ea;hp=a2604bcfb58c10e5b6164cd0bcd9d60ae7f9b329;hpb=2b2beddc7447197d12fcbcae96772e1f38eef138;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index a2604bcf..900cb943 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -34,7 +34,7 @@ static void event_handle_root(XEvent *e);
 static void event_handle_dock(Dock *s, XEvent *e);
 static void event_handle_dockapp(DockApp *app, XEvent *e);
 static void event_handle_client(Client *c, XEvent *e);
-static void event_handle_menu(Menu *menu, XEvent *e);
+static void event_handle_menu(Menu *menu, Client *c, XEvent *e);
 
 #define INVALID_FOCUSIN(e) ((e)->xfocus.detail == NotifyInferior || \
                             (e)->xfocus.detail > NotifyNonlinearVirtual)
@@ -436,7 +436,7 @@ static void event_process(XEvent *e)
 
     /* deal with it in the kernel */
     if (menu) {
-        event_handle_menu(menu, e);
+        event_handle_menu(menu, client, e);
         return;
     } else if (client)
 	event_handle_client(client, e);
@@ -895,10 +895,9 @@ static void event_handle_client(Client *client, XEvent *e)
 	}
 	else if (msgtype == prop_atoms.net_wm_strut)
 	    client_update_strut(client);
-	else if (msgtype == prop_atoms.net_wm_icon)
+	else if (msgtype == prop_atoms.net_wm_icon ||
+                 msgtype == prop_atoms.kwm_win_icon)
 	    client_update_icons(client);
-	else if (msgtype == prop_atoms.kwm_win_icon)
-	    client_update_kwm_icon(client);
     default:
         ;
 #ifdef SHAPE
@@ -910,7 +909,7 @@ static void event_handle_client(Client *client, XEvent *e)
     }
 }
 
-static void event_handle_menu(Menu *menu, XEvent *e)
+static void event_handle_menu(Menu *menu, Client *client, XEvent *e)
 {
     MenuEntry *entry;