X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=414be04e47cdc3f256a7fa75023209d9549bb9d5;hb=6f5292c87ece138a2b80d102ba0919b105b1839a;hp=eb206a11f732cac4478273661cb83b1b026e2ad8;hpb=e5908c3f897156b13d1e7592c155bfd5ca2a82a4;p=chaz%2Fopenbox diff --git a/openbox/mouse.c b/openbox/mouse.c index eb206a11..414be04e 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -142,7 +142,7 @@ void mouse_unbind_all() GSList *it; for (it = b->actions[j]; it; it = it->next) - action_free(it->data); + action_unref(it->data); g_slist_free(b->actions[j]); } g_free(b); @@ -167,7 +167,7 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context, /* if not bound, then nothing to do! */ if (it == NULL) return FALSE; - action_run_mouse(b->actions[a], c, state, button, x, y); + action_run_mouse(b->actions[a], c, context, state, button, x, y); return TRUE; } @@ -213,6 +213,7 @@ void mouse_event(ObClient *client, XEvent *e) int junk1, junk2; Window wjunk; guint ujunk, b, w, h; + /* this can cause errors to occur when the window closes */ xerror_set_ignore(TRUE); junk1 = XGetGeometry(ob_display, e->xbutton.window, &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);