Skip to content
Browse files

Merge branch 'master' of ssh://tim@nada1.de/home/tim/public_html/dev/…

…dwm_edje

Conflicts:

	src/dwm_ruby/x11.c
  • Loading branch information...
2 parents c54136f + c250e7f commit 3fd984dd906e66493d27c67ab38fa8ef2ce7a738 nutzer committed Jun 9, 2008
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/dwm_ruby/x11.c
View
6 src/dwm_ruby/x11.c
@@ -106,7 +106,7 @@ void raise_client(Client* c) {
//XSelectInput(c->manager->dpy, c->win, EnterWindowMask | FocusChangeMask
// | PropertyChangeMask | StructureNotifyMask);
//XMoveResizeWindow(c->manager->dpy, c->win, c->x, c->y, c->w, c->h); // some wins need this
- //XMapWindow(c->manager->dpy, c->win);
+ XMapWindow(c->manager->dpy, c->win);
c->manager->selected = c;
XRaiseWindow(c->manager->dpy, c->win);
XSync(c->manager->dpy, False);
@@ -255,8 +255,8 @@ void Destroy_WM(WM* winman) {
XSetInputFocus(winman->dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
XSync(winman->dpy, False);
XCloseDisplay(winman->dpy);
- free(winman->clients);
- free(winman);
+ //free(winman->clients); //Doesn't seem to work -> SEGFAULTS
+ //free(winman);
}
int main() {

0 comments on commit 3fd984d

Please sign in to comment.
Something went wrong with that request. Please try again.