X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fevent.c;h=e2851809ab7f3016fd650e560bd6eedc35044ed2;hb=52d751ecd67bc063df51c815aa6980a55e2f4eb7;hp=f5b2ec4823127d464e843aaa883789537eefbafd;hpb=0453a1dbedddadddf31c8ca40e1326e7c34d6362;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index f5b2ec48..e2851809 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -138,6 +138,10 @@ void event_shutdown(gboolean reconfig)
 {
     if (reconfig) return;
 
+#ifdef USE_SM
+    IceRemoveConnectionWatch(ice_watch, NULL);
+#endif
+
     client_remove_destructor(focus_delay_client_dest);
     XFreeModifiermap(modmap);
 }
@@ -581,7 +585,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
         /* Wheel buttons don't draw because they are an instant click, so it
            is a waste of resources to go drawing it. */
         if (!(e->xbutton.button == 4 || e->xbutton.button == 5)) {
-            switch (frame_context(client, e->xbutton.window)) {
+            con = frame_context(client, e->xbutton.window);
+            con = mouse_button_frame_context(con, e->xbutton.button);
+            switch (con) {
             case OB_FRAME_CONTEXT_MAXIMIZE:
                 client->frame->max_press = (e->type == ButtonPress);
                 framerender_frame(client->frame);