From 25d812426b379af6326e5c8707da93cd3f2e0a4c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 30 Jan 2006 09:50:16 +0000 Subject: [PATCH] some fixes while trying to make it work ;/ svn path=/trunk/KDE/kdebase/workspace/; revision=503766 --- kompmgr/kompmgr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kompmgr/kompmgr.c b/kompmgr/kompmgr.c index 5308a3f645..e2d57595bf 100644 --- a/kompmgr/kompmgr.c +++ b/kompmgr/kompmgr.c @@ -2201,7 +2201,7 @@ expose_root (Display *dpy, Window root, XRectangle *rects, int nrects) static int ev_serial (XEvent *ev) { - if (ev->type & 0x7f != KeymapNotify) + if ((ev->type & 0x7f) != KeymapNotify) return ev->xany.serial; return NextRequest (ev->xany.display); } @@ -2413,10 +2413,10 @@ loadConfig(char *filename){ if( filename == NULL ){ const char *home = getenv("HOME"); const char *configfile = "/.xcompmgrrc"; - wasNull = True; - int n = strlen(home)+strlen(configfile)+1; + int n = strlen(home)+strlen(configfile)+1; filename = (char*)malloc(n*sizeof(char)); - memset(filename,0,n); + memset(filename,0,n); + wasNull = True; strcat(filename, home); strcat(filename, configfile); @@ -2710,7 +2710,7 @@ main (int argc, char **argv) } XNextEvent (dpy, &ev); - if (ev.type & 0x7f != KeymapNotify) + if ((ev.type & 0x7f) != KeymapNotify) discard_ignore (dpy, ev.xany.serial); #if DEBUG_EVENTS printf ("event %10.10s serial 0x%08x window 0x%08x\n",