summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--config/gdm.conf.in2
-rw-r--r--daemon/gdm.h2
-rw-r--r--gui/gdmsetup.desktop.in2
4 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 78e4ec64..0a823c21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Jul 10 14:33:59 2003 George Lebl <jirka@5z.com>
+
+ * gui/gdmsetup.desktop.in: This is a system SETUP tool, not a system
+ tool so change System keyword to SystemSetup, also add
+ X-Red-Hat-Base, so that it shows up in the non-others menu (This
+ should have been done the other way around IMO, no keyword means
+ it goes in the main menu) </rant> Fixes bug #116977
+
+ * daemon/gdm.h, config/gdm.conf.in: sync the defaults for Exclude
+ and add pcap user to excludes
+
Tue Jul 08 01:42:43 2003 George Lebl <jirka@5z.com>
* gui/gdmsetup.glade: the DisallowTCP checkbox label is now more
diff --git a/config/gdm.conf.in b/config/gdm.conf.in
index d80b6ab6..cd211791 100644
--- a/config/gdm.conf.in
+++ b/config/gdm.conf.in
@@ -204,7 +204,7 @@ Browser=false
# The default picture in the browser
DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
# These are things excluded from the face browser, not from logging in
-Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm,nfsnobody
+Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm,nfsnobody,pcap
# As an alternative to the above this is the minimum uid to show
MinimalUID=100
# If user or user.png exists in this dir it will be used as his picture
diff --git a/daemon/gdm.h b/daemon/gdm.h
index 89ea8653..d4899dcb 100644
--- a/daemon/gdm.h
+++ b/daemon/gdm.h
@@ -219,7 +219,7 @@ enum {
#define GDM_KEY_ICONHEIGHT "gui/MaxIconHeight=128"
#define GDM_KEY_BROWSER "greeter/Browser=false"
-#define GDM_KEY_EXCLUDE "greeter/Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm"
+#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_MINIMALUID "greeter/MinimalUID=100"
#define GDM_KEY_FACE "greeter/DefaultFace=" EXPANDED_PIXMAPDIR "nobody.png"
#define GDM_KEY_FACEDIR "greeter/GlobalFaceDir=" EXPANDED_DATADIR "/faces/"
diff --git a/gui/gdmsetup.desktop.in b/gui/gdmsetup.desktop.in
index 27662073..cdfd7e20 100644
--- a/gui/gdmsetup.desktop.in
+++ b/gui/gdmsetup.desktop.in
@@ -9,7 +9,7 @@ Icon=gdm.png
StartupNotify=true
Terminal=false
Type=Application
-Categories=Application;System;
+Categories=Application;SystemSetup;X-Red-Hat-Base;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gdm
X-GNOME-Bugzilla-Component=general