diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2016-09-04 21:15:09 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2016-09-04 21:15:09 +0100 |
| commit | c2ed2a7b0dcfa0f16cad6aef1d2a196629619d50 (patch) | |
| tree | be9ce910047f2183ea5848633d4292a266325bc0 /config | |
| parent | ee8b08a4cdefcfb70ab30229d0a9e3cd9c6652df (diff) | |
Remove remaining chooser configuration bits
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.am | 3 | ||||
| -rw-r--r-- | config/Xresources.cpp | 10 | ||||
| -rw-r--r-- | config/xenodm-config.cpp | 13 |
3 files changed, 3 insertions, 23 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 383e4ed..5c50ca3 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -52,8 +52,7 @@ CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \ -DXENODMXAUTHDIR="$(XENODMXAUTHDIR)" \ --DXENODMCONFIGDIR="$(XENODMCONFIGDIR)" \ -DXENODMSCRIPTDIR="$(XENODMSCRIPTDIR)" -DSU="$(SU)" \ - -DCHOOSERPATH="$(XENODMLIBDIR)/chooser" $(XPMDEFINES) \ - -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES) + $(XPMDEFINES) -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES) Xservers.ws: $(srcdir)/Xservers.ws.cpp $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@ diff --git a/config/Xresources.cpp b/config/Xresources.cpp index 6a7bb74..25cde57 100644 --- a/config/Xresources.cpp +++ b/config/Xresources.cpp @@ -135,13 +135,3 @@ XConsole.text.geometry: 480x130 XConsole.verbose: true XConsole*iconic: true XConsole*font: fixed - -Chooser*geometry: 640x480 -Chooser*allowShellResize: false -Chooser*viewport.forceBars: true - -Chooser*label.font: -adobe-helvetica-bold-o-normal--24-*-p-*-iso8859-1 -Chooser*label.label: XDMCP Host Menu from CLIENTHOST -Chooser*label.foreground: black -Chooser*list.font: lucidasanstypewriter-12 -Chooser*Command.font: -adobe-helvetica-medium-r-normal--18-*-p-*-iso8859-1 diff --git a/config/xenodm-config.cpp b/config/xenodm-config.cpp index ae8a36d..b4ead86 100644 --- a/config/xenodm-config.cpp +++ b/config/xenodm-config.cpp @@ -20,7 +20,6 @@ DisplayManager*resources: XENODMCONFIGDIR/Xresources ! individual resource settings. DisplayManager*authorize: true ! -DisplayManager*chooser: CHOOSERPATH DisplayManager*startup: XENODMSCRIPTDIR/Xstartup DisplayManager*session: XENODMSCRIPTDIR/Xsession DisplayManager*reset: XENODMSCRIPTDIR/Xreset @@ -29,13 +28,5 @@ DisplayManager*authComplain: true DisplayManager._0.setup: XENODMSCRIPTDIR/Xsetup_0 DisplayManager._0.startup: XENODMSCRIPTDIR/GiveConsole DisplayManager._0.reset: XENODMSCRIPTDIR/TakeConsole -#if HAS_DES_AUTH == YES -DisplayManager.*.authName: MIT-MAGIC-COOKIE-1 -#endif -#ifdef XPM -DisplayManager*loginmoveInterval: 10 -#endif /* XPM */ -! -! SECURITY: do not listen for XDMCP or Chooser requests -! Comment out this line if you want to manage X terminals with xenodm -DisplayManager.requestPort: 0 + +DisplayManager.*.authName: MIT-MAGIC-COOKIE-1 |