From 24ce829f7f839843421fdc4a2057dbba7be8580e Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Thu, 10 Oct 2013 20:38:27 +0200 Subject: [PATCH] wmaker: Removed global variable 'WDelayedActionSet' and associated dead code The variable's value was set to 0 but never changed afterwards, so the function using it would never do anything. --- src/main.c | 3 --- src/startup.c | 33 --------------------------------- 2 files changed, 36 deletions(-) diff --git a/src/main.c b/src/main.c index a99af1ae..b30970b9 100644 --- a/src/main.c +++ b/src/main.c @@ -83,9 +83,6 @@ WDDomain *WDWindowMaker = NULL; WDDomain *WDWindowAttributes = NULL; WDDomain *WDRootMenu = NULL; -/* special flags */ -char WDelayedActionSet = 0; - /* notifications */ const char WMNManaged[] = "WMNManaged"; const char WMNUnmanaged[] = "WMNUnmanaged"; diff --git a/src/startup.c b/src/startup.c index 80724636..a15190dc 100644 --- a/src/startup.c +++ b/src/startup.c @@ -90,11 +90,6 @@ extern WDDomain *WDRootMenu; extern WDDomain *WDWindowAttributes; extern WShortKey wKeyBindings[WKBD_LAST]; -#ifndef HAVE_INOTIFY -/* special flags */ -extern char WDelayedActionSet; -#endif - /***** Local *****/ static WScreen **wScreen = NULL; static unsigned int _NumLockMask = 0; @@ -143,28 +138,6 @@ static int handleXIO(Display * xio_dpy) return 0; } -#ifndef HAVE_INOTIFY -/* - *---------------------------------------------------------------------- - * delayedAction- - * Action to be executed after the signal() handler is exited. - *---------------------------------------------------------------------- - */ -static void delayedAction(void *cdata) -{ - if (WDelayedActionSet == 0) - return; - - WDelayedActionSet--; - /* - * Make the event dispatcher do whatever it needs to do, - * including handling zombie processes, restart and exit - * signals. - */ - DispatchEvent(NULL); -} -#endif - /* *---------------------------------------------------------------------- * handleExitSig-- @@ -528,12 +501,6 @@ void StartUp(Bool defaultScreenOnly) wPreferences.cursor[WCUR_EMPTY] = XCreatePixmapCursor(dpy, cur, cur, &black, &black, 0, 0); XFreePixmap(dpy, cur); - -#ifndef HAVE_INOTIFY - /* signal handler stuff that gets called when a signal is caught */ - WMAddPersistentTimerHandler(500, delayedAction, NULL); -#endif - /* emergency exit... */ sig_action.sa_handler = handleSig; sigemptyset(&sig_action.sa_mask); -- 2.11.4.GIT