Changed default face directory to EXPANDED_DATADIR/pixmaps/faces since

Thu Mar 10 17:50:00 2005  Brian Cameron <Brian.Cameron@Sun.Com>

        * daemon/gdm.h, config/gdm.conf.in: Changed default face
          directory to EXPANDED_DATADIR/pixmaps/faces since putting
          the faces subdirectory in pixmaps simply makes more
          sense.
        * Makefile.am, acconfig.h, configure.in, gdmsetup-security.in,
          daemon/Makefile.am, daemon/gdm.h, daemon/gdm.in, daemon/slave.c,
          gui/Makefile.am, gui/gdmsetup.c, gui/greeter/Makefile.am,
          gui/greeter/greeter.c: Changed the way GDM files are installed.
          Now all programs intended to be run by root are in
          EXPANDED_SBINDIR (gdm/gdm-binary/gdmsetup), all programs
          that are not intended to be run by end-users are in
          EXPANDED_LIBEXEC (gdmchooser/gdmgreeter/gdmlogin).  Removed
          gdmconfig wrapper script and gdm Xnest symlink since they
          only serve to clutter the filesystem.  I announced this
          change in the 2.6.0.8 release notes and will be bumping
          the next release to 2.6 because of this change and the
          change to the default face directory.

        * configure.in, gui/faces/*: Add default faces.  Images
          provided by Jaap A. Haitsma.  Refer to bugzilla bug
          #149838.
        * gui/gdmphotosetup.c: Now browser will look in the system
          face directory first, in EXPANDED_DATADIR/pixmaps if the
          default face directory does not exist.
        * config/Makefile.am: Changed name of Default to Init since
          that follows the naming standard used by the other scripts.
          Fixes bug 118278.
        * docs/C/gdm.xml: Updated docs with information about
          the changes in today's commits.

4 files changed, 16 insertions, 17 deletions

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 9f8742d5..5e02c6d2 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -22,7 +22,7 @@ INCLUDES = \
 #	-DGNOME_DISABLE_DEPRECATED			\
 #
 
-bin_PROGRAMS = gdm-binary
+sbin_PROGRAMS = gdm-binary
 
 gdm_binary_SOURCES = \
 	gdm.c \
@@ -76,6 +76,6 @@ gdm_binary_LDADD = \
 	-L$(top_builddir)/vicious-extensions	\
 	-lvicious
 
-bin_SCRIPTS = gdm
+sbin_SCRIPTS = gdm
 
 EXTRA_DIST = gdm.in
diff --git a/daemon/gdm.h b/daemon/gdm.h
index 58d51862..186f2c42 100644
--- a/daemon/gdm.h
+++ b/daemon/gdm.h
@@ -121,15 +121,15 @@ enum {
 #define PIPE_SIZE 4096
 
 /* Configuration constants */
-#define GDM_KEY_CHOOSER "daemon/Chooser=" EXPANDED_BINDIR "/gdmchooser"
+#define GDM_KEY_CHOOSER "daemon/Chooser=" EXPANDED_LIBEXECDIR "/gdmchooser"
 /* This defaults to true for backward compatibility,
  * it will not actually do automatic login since the AutomaticLogin defaults
  * to nothing */
 #define GDM_KEY_AUTOMATICLOGIN_ENABLE "daemon/AutomaticLoginEnable=true"
 #define GDM_KEY_AUTOMATICLOGIN "daemon/AutomaticLogin="
 #define GDM_KEY_ALWAYSRESTARTSERVER "daemon/AlwaysRestartServer=false"
-#define GDM_KEY_GREETER "daemon/Greeter=" EXPANDED_BINDIR "/gdmlogin"
-#define GDM_KEY_REMOTEGREETER "daemon/RemoteGreeter=" EXPANDED_BINDIR "/gdmlogin"
+#define GDM_KEY_GREETER "daemon/Greeter=" EXPANDED_LIBEXECDIR "/gdmlogin"
+#define GDM_KEY_REMOTEGREETER "daemon/RemoteGreeter=" EXPANDED_LIBEXECDIR "/gdmlogin"
 #define GDM_KEY_ADD_GTK_MODULES "daemon/AddGtkModules=false"
 #define GDM_KEY_GTK_MODULES_LIST "daemon/GtkModulesList="
 #define GDM_KEY_GROUP "daemon/Group=gdm"
@@ -227,12 +227,12 @@ enum {
 #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/"
+#define GDM_KEY_FACEDIR "greeter/GlobalFaceDir=" EXPANDED_DATADIR "/pixmaps/faces/"
 #define GDM_KEY_LOCFILE "greeter/LocaleFile=" EXPANDED_LOCALEDIR "/locale.alias"
 #define GDM_KEY_LOGO "greeter/Logo=" EXPANDED_PIXMAPDIR "/gdm-foot-logo.png"
 #define GDM_KEY_QUIVER "greeter/Quiver=true"
 #define GDM_KEY_SYSMENU "greeter/SystemMenu=true"
-#define GDM_KEY_CONFIGURATOR "daemon/Configurator=" EXPANDED_GDMCONFIGDIR "/gdmsetup --disable-sound --disable-crash-dialog"
+#define GDM_KEY_CONFIGURATOR "daemon/Configurator=" EXPANDED_SBINDIR "/gdmsetup --disable-sound --disable-crash-dialog"
 #define GDM_KEY_CONFIG_AVAILABLE "greeter/ConfigAvailable=true"
 #define GDM_KEY_CHOOSER_BUTTON "greeter/ChooserButton=true"
 #define GDM_KEY_TITLE_BAR "greeter/TitleBar=true"
@@ -734,7 +734,8 @@ void		gdm_final_cleanup	(void);
 #define GDM_SUP_GET_CONFIG "GET_CONFIG" /* <key> */
 /* GET_CONFIG:  Get configuration value for key.  Useful so
  * that other programs can request configuration information
- * from GDM.
+ * from GDM.  Any key defined as GDM_KEY_* in gdm.h is 
+ * supported.
  * Supported since: 2.6.0.9
  * Arguments:   <key>
  * Answers:
diff --git a/daemon/gdm.in b/daemon/gdm.in
index c83eb675..05e7a501 100644
--- a/daemon/gdm.in
+++ b/daemon/gdm.in
@@ -23,7 +23,5 @@ then
     fi
 fi
 
-exec @EXPANDED_BINDIR@/gdm-binary "$@"
+exec @EXPANDED_SBINDIR@/gdm-binary "$@"
 
-# fallback, use PATH
-exec gdm-binary "$@"
diff --git a/daemon/slave.c b/daemon/slave.c
index 000172b5..2cdb544c 100644
--- a/daemon/slave.c
+++ b/daemon/slave.c
@@ -1670,7 +1670,7 @@ run_config (GdmDisplay *display, struct passwd *pwent)
 				 "default location."));
 
 		argv = ve_split
-			(EXPANDED_BINDIR
+			(EXPANDED_LIBEXECDIR
 			 "/gdmsetup --disable-sound --disable-crash-dialog");
 		if (access (argv[0], X_OK) == 0)
 			VE_IGNORE_EINTR (execv (argv[0], argv));
@@ -2624,11 +2624,11 @@ gdm_slave_greeter (void)
 		if (strstr (command, "gdmlogin") != NULL) {
 			/* in case it is gdmlogin that's crashing
 			   try the graphical greeter for luck */
-			command = EXPANDED_BINDIR "/gdmgreeter";
+			command = EXPANDED_LIBEXECDIR "/gdmgreeter";
 		} else {
 			/* in all other cases, try the gdmlogin (standard greeter)
 			   proggie */
-			command = EXPANDED_BINDIR "/gdmlogin";
+			command = EXPANDED_LIBEXECDIR "/gdmlogin";
 		}
 	}
 
@@ -2649,13 +2649,13 @@ gdm_slave_greeter (void)
 
 	gdm_error (_("%s: Cannot start greeter trying default: %s"),
 		   "gdm_slave_greeter",
-		   EXPANDED_BINDIR "/gdmlogin");
+		   EXPANDED_LIBEXECDIR "/gdmlogin");
 
 	ve_setenv ("GDM_WHACKED_GREETER_CONFIG", "true", TRUE);
 
-	exec_command (EXPANDED_BINDIR "/gdmlogin", NULL);
+	exec_command (EXPANDED_LIBEXECDIR "/gdmlogin", NULL);
 
-	VE_IGNORE_EINTR (execl (EXPANDED_BINDIR "/gdmlogin", EXPANDED_BINDIR "/gdmlogin", NULL));
+	VE_IGNORE_EINTR (execl (EXPANDED_LIBEXECDIR "/gdmlogin", EXPANDED_LIBEXECDIR "/gdmlogin", NULL));
 
 	gdm_error_box (d,
 		       GTK_MESSAGE_ERROR,