gdm r5883 - in trunk: . daemon

[mccann svn gnome org]

Author: mccann
Date: Tue Feb 26 22:43:04 2008
New Revision: 5883
URL: http://svn.gnome.org/viewvc/gdm?rev=5883&view=rev

Log:
2008-02-26  William Jon McCann  <jmccann redhat com>

	* daemon/main.c: (main):
	Don't daemonize and remove some unused options.



Modified:
   trunk/ChangeLog
   trunk/daemon/main.c

Modified: trunk/daemon/main.c
==============================================================================
--- trunk/daemon/main.c	(original)
+++ trunk/daemon/main.c	Tue Feb 26 22:43:04 2008
@@ -511,21 +511,13 @@
         gboolean            res;
         gboolean            xdmcp_enabled;
         GdmSignalHandler   *signal_handler;
-        static char        *config_file      = NULL;
         static gboolean     debug            = FALSE;
-        static gboolean     no_daemon        = FALSE;
-        static gboolean     no_console       = FALSE;
         static gboolean     do_timed_exit    = FALSE;
         static gboolean     print_version    = FALSE;
         static gboolean     fatal_warnings   = FALSE;
         static GOptionEntry entries []   = {
-                { "config", 0, 0, G_OPTION_ARG_STRING, &config_file, N_("Alternative GDM System Defaults configuration file"), N_("CONFIGFILE") },
-
                 { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
                 { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, N_("Make all warnings fatal"), NULL },
-                { "no-daemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Don't become a daemon"), NULL },
-                { "no-console", 0, 0, G_OPTION_ARG_NONE, &no_console, N_("No console (static) servers to be run"), NULL },
-
                 { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time - for debugging"), NULL },
                 { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL },
 
@@ -545,15 +537,6 @@
         context = g_option_context_new (_("GNOME Display Manager"));
         g_option_context_add_main_entries (context, entries, NULL);
 
-        /* preprocess the arguments to support the xdm style -nodaemon
-         * option
-         */
-        for (i = 0; i < argc; i++) {
-                if (strcmp (argv[i], "-nodaemon") == 0) {
-                        argv[i] = (char *) "--no-daemon";
-                }
-        }
-
         error = NULL;
         res = g_option_context_parse (context, &argc, &argv, &error);
         g_option_context_free (context);
@@ -571,10 +554,6 @@
                 g_log_set_always_fatal (fatal_mask);
         }
 
-        if (! no_daemon && daemon (0, 0)) {
-                g_error ("Could not daemonize: %s", g_strerror (errno));
-        }
-
         connection = get_system_bus ();
         if (connection == NULL) {
                 goto out;