summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorBrian Cameron <Brian.Cameron@Sun.Com>2005-03-15 02:28:40 +0000
committerBrian Cameron <bcameron@src.gnome.org>2005-03-15 02:28:40 +0000
commit76876696959da5288474f360577fe48fa8097b50 (patch)
tree26bb02be10a7ca7e9bb617528a711f0500a556ea /daemon
parentd31fc95fbcb40c849f31c3309262f47e9887bf14 (diff)
downloadgdm-76876696959da5288474f360577fe48fa8097b50.tar.gz
Added Include and IncludeAll gdm config options to better control what
Mon Mar 14 12:10:00 2005 Brian Cameron <Brian.Cameron@Sun.Com> * daemon/gdm.h, gui/Makefile.am, gui/gdmlogin.c, gui/gdmsetup.c, gui/gdmuser.h, gui/gdmuser.c, gui/greeter/greeter.c, gui/greeter/greeter_item_ulist.c, docs/C/gdm.xml: Added Include and IncludeAll gdm config options to better control what users are displayed in the face browser. Consolidated the almost identical logic from gdmlogin.c, gdmsetup.c and greeter_item_ulist.c into gdm_user.[ch]. * daemon/gdm.h: Correct setting of HALT_COMMAND, which got fat-fingered when I moved the setup of this to the configure file. * gui/gdmphotosetup.c: Mark strings for translation.
Diffstat (limited to 'daemon')
-rw-r--r--daemon/gdm.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/daemon/gdm.h b/daemon/gdm.h
index 186f2c42..e120fbd0 100644
--- a/daemon/gdm.h
+++ b/daemon/gdm.h
@@ -133,7 +133,7 @@ enum {
#define GDM_KEY_ADD_GTK_MODULES "daemon/AddGtkModules=false"
#define GDM_KEY_GTK_MODULES_LIST "daemon/GtkModulesList="
#define GDM_KEY_GROUP "daemon/Group=gdm"
-#define GDM_KEY_HALT "daemon/DefaultPath=" HALT_COMMAND
+#define GDM_KEY_HALT "daemon/HaltCommand=" HALT_COMMAND
#define GDM_KEY_INITDIR "daemon/DisplayInitDir=" EXPANDED_SYSCONFDIR "/gdm/Init"
#define GDM_KEY_KILLIC "daemon/KillInitClients=true"
#define GDM_KEY_LOGDIR "daemon/LogDir=" EXPANDED_LOGDIR
@@ -224,7 +224,9 @@ enum {
#define GDM_KEY_GTK_THEMES_TO_ALLOW "gui/GtkThemesToAllow=all"
#define GDM_KEY_BROWSER "greeter/Browser=false"
+#define GDM_KEY_INCLUDE "greeter/Include="
#define GDM_KEY_EXCLUDE "greeter/Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm,nfsnobody,pcap"
+#define GDM_KEY_INCLUDEALL "greeter/IncludeAll=false"
#define GDM_KEY_MINIMALUID "greeter/MinimalUID=100"
#define GDM_KEY_FACE "greeter/DefaultFace=" EXPANDED_PIXMAPDIR "/nobody.png"
#define GDM_KEY_FACEDIR "greeter/GlobalFaceDir=" EXPANDED_DATADIR "/pixmaps/faces/"