Updated. Update to new release version. Fix typo in gdm.h.

2006-04-09  Brian Cameron  <brian.cameron@sun.com>

        * Release 2.14.12:
        * NEWS: Updated.
        * configure.ac: Update to new release version.
        * daemon/gdm.h: Fix typo in gdm.h.

2007-04-09  Brian Cameron  <brian.cameron@sun.com>

        * configure.ac, daemon/gdm.[ch], gui/gdmlogin.c, gui/gdmcomm.c,
          gui/gdmXnestchooser.c, gui/greeter/greeter.c,
          gui/gdmflexiserver.c:  Deprecated GDM_KEY_PID_FILE and now
          use /var/run/gdm.pid.  This fixes bug #162849.  Backported
          from head, patch by William Jon McCann <mccann@jhu.edu>.

svn path=/branches/gnome-2-14/; revision=4801

5 files changed, 35 insertions, 22 deletions

diff --git a/gui/gdmXnestchooser.c b/gui/gdmXnestchooser.c
index 2380daf4..e2cf49db 100644
--- a/gui/gdmXnestchooser.c
+++ b/gui/gdmXnestchooser.c
@@ -498,7 +498,7 @@ main (int argc, char *argv[])
 
 	xdmcp_enabled  = gdm_config_get_bool (GDM_KEY_XDMCP);
 	honor_indirect = gdm_config_get_bool (GDM_KEY_INDIRECT);
-	pidfile        = gdm_config_get_string (GDM_KEY_PID_FILE);
+	pidfile        = GDM_PID_FILE;
 	xnest          = gdm_config_get_string (GDM_KEY_XNEST);
 
 	/* At this point we are done using the socket, so close it */
diff --git a/gui/gdmcomm.c b/gui/gdmcomm.c
index a5d5080e..0e8ec352 100644
--- a/gui/gdmcomm.c
+++ b/gui/gdmcomm.c
@@ -593,7 +593,7 @@ gdmcomm_check (gboolean show_dialog)
 	struct stat s;
 	int statret;
 
-	pidfile = gdm_config_get_string (GDM_KEY_PID_FILE);
+	pidfile = GDM_PID_FILE;
 
 	pid = 0;
 	if (pidfile != NULL)
diff --git a/gui/gdmflexiserver.c b/gui/gdmflexiserver.c
index b507e90a..756a964c 100644
--- a/gui/gdmflexiserver.c
+++ b/gui/gdmflexiserver.c
@@ -729,8 +729,26 @@ main (int argc, char *argv[])
 	if (args != NULL && args[0] != NULL)
 		server = args[0];
 
-	if ( ! gdmcomm_check (FALSE)) {
-		return 1;
+	if (send_command != NULL) {
+		if ( ! gdmcomm_check (FALSE)) {
+			gdm_common_error ("Error: GDM (GNOME Display Manager) "
+			"is not running.");
+			gdm_common_error ("You might be using a different "
+			"display manager.");
+			return 1;
+		}
+	} else {
+		/*
+		 * The --command argument does not display anything, so avoid
+		 * running gtk_init until it finishes.  Sometimes the
+		 * --command argument is used when there is no display so it
+		 * will fail and cause the program to exit, complaining about
+		 * "no display".
+		 */
+		gtk_init(&argc, &argv);
+		if ( ! gdmcomm_check (TRUE)) {
+			return 1;
+		}
 	}
 
 	/* Start reading config data in bulk */
@@ -796,25 +814,22 @@ main (int argc, char *argv[])
 	}
 
 	/*
-	 * The --command argument does not display anything, so avoid running 
-	 * gtk_init until it finishes.  Sometimes the --command argument is
-	 * used when there is no display so it will fail and cause the 
-	 * program to exit, complaining about "no display".  
+	 * Now process what gdmflexiserver is more frequently used to
+	 * do, start VT (Virtual Terminal) sesions - at least on
+	 * systems where it is supported.  On systems where it is not
+	 * supporteed VT stands for "Very Tight" and will mess up your
+	 * display if you use it.  Tight!  So do not use it.
 	 *
-	 * Now process what gdmflexiserver is more used to do, start a
-	 * VT virtual terminal sesions - at least on systems where it
-	 * works.  On systems where it doesn't work VT stands for
-	 * "Very Tight" and will mess up your display if you try to
-	 * use it.  Tight!  So don't use it.  I'd accept a patch to
-	 * disable it, but its easy to avoid not using it as long
-	 * as your distro doesn't put the menu choice in the 
-	 * application launch button on the panel (don't ship the
-	 * desktop file).
+	 * I would accept a patch to disable it on such systems, but it
+	 * is easy to avoid not using it as long as your distro does not
+	 * put the menu choice in the application launch button on the
+	 * panel (don't ship the desktop file).
 	 */
-	gtk_init(&argc, &argv);
 
-	/* always attempt to get cookie and authenticate.  On remote
-	servers */
+	/*
+	 * Always attempt to get cookie and authenticate.  On remote
+	 * servers
+	 */
 	auth_cookie = gdmcomm_get_auth_cookie ();
 
 	/* check for other displays/logged in users */
diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c
index 89eb528b..4255b839 100644
--- a/gui/gdmlogin.c
+++ b/gui/gdmlogin.c
@@ -3013,7 +3013,6 @@ gdm_read_config (void)
 
 	/* Keys not to include in reread_config */
 	gdm_config_get_bool   (GDM_KEY_LOCK_POSITION);
-	gdm_config_get_string (GDM_KEY_PID_FILE);
 	gdm_config_get_int    (GDM_KEY_POSITION_X);
 	gdm_config_get_int    (GDM_KEY_POSITION_Y);
 	gdm_config_get_string (GDM_KEY_PRE_FETCH_PROGRAM);
diff --git a/gui/greeter/greeter.c b/gui/greeter/greeter.c
index 86fc245a..e9d00243 100644
--- a/gui/greeter/greeter.c
+++ b/gui/greeter/greeter.c
@@ -792,7 +792,6 @@ gdm_read_config (void)
 
 	/* Keys not to include in reread_config */
 	gdm_config_get_string (GDM_KEY_SESSION_DESKTOP_DIR);
-	gdm_config_get_string (GDM_KEY_PID_FILE);
 	gdm_config_get_string (GDM_KEY_PRE_FETCH_PROGRAM);
 
 	gdmcomm_comm_bulk_stop ();