As found by Rodolfo García Peñas, this flag is never given a value; further investigations in the history of the project show that this flag have never been implemented because its action is totally redundant with the flag "noupdate".
As the later flag's name is more clear about what the behaviour for the user is, as opposed to what is being done under the hood, its name is kept and the "nopolling" flag is removed. Signed-off-by: Christophe CURIS <[email protected]> --- src/WindowMaker.h | 3 --- src/main.c | 10 ++++++---- src/startup.c | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/WindowMaker.h b/src/WindowMaker.h index 2d9ed1a..e954ee8 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -470,9 +470,6 @@ extern struct WPreferences { unsigned int noupdates:1; /* don't require ~/GNUstep (-static) */ unsigned int noautolaunch:1; /* don't autolaunch apps */ unsigned int norestore:1; /* don't restore session */ -#ifndef HAVE_INOTIFY - unsigned int nopolling:1; /* don't poll the defaults database for changes */ -#endif unsigned int restarting:2; } flags; /* internal flags */ diff --git a/src/main.c b/src/main.c index 6780803..21e970b 100644 --- a/src/main.c +++ b/src/main.c @@ -679,12 +679,14 @@ static int real_main(int argc, char **argv) wwarning(_("bad value for visualid: \"%s\""), argv[i]); exit(0); } - } else if (strcmp(argv[i], "-static") == 0 || strcmp(argv[i], "--static") == 0 + } else if (strcmp(argv[i], "-static") == 0 || strcmp(argv[i], "--static") == 0) { + wPreferences.flags.noupdates = 1; + } else if (strcmp(argv[i], "--no-polling") == 0) { #ifndef HAVE_INOTIFY - || strcmp(argv[i], "--no-polling") == 0 -#endif - ) { wPreferences.flags.noupdates = 1; +#else + wmessage(_("your version of Window Maker was compiler with INotify support, so \"--no-polling\" has no effect")); +#endif } else if (strcmp(argv[i], "--help") == 0) { print_help(); exit(0); diff --git a/src/startup.c b/src/startup.c index 2122d48..c369dba 100644 --- a/src/startup.c +++ b/src/startup.c @@ -705,7 +705,7 @@ void StartUp(Bool defaultScreenOnly) #ifndef HAVE_INOTIFY /* setup defaults file polling */ - if (!wPreferences.flags.nopolling && !wPreferences.flags.noupdates) + if (!wPreferences.flags.noupdates) WMAddTimerHandler(3000, wDefaultsCheckDomains, NULL); #endif -- 2.1.4 -- To unsubscribe, send mail to [email protected].
