include grab.h

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 900567c0f255aecbd5417531599eafa9466b0615..b0048e3725c158c4eac5296394f9083b735fbfef 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -21,6 +21,10 @@
 #include <X11/Xatom.h>
 #include <glib.h>
 
+#ifdef USE_LIBSN
+#  include <libsn/sn.h>
+#endif
+
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif
@@ -129,6 +133,10 @@ void event_loop()
        }
        XNextEvent(ob_display, &e);
 
+#ifdef USE_LIBSN
+        sn_display_process_event(ob_sn_display, &e);
+#endif
+
        event_process(&e);
         had_event = TRUE;
     }
@@ -887,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