gnome-power-manager r3111 - in trunk: . src

[jedywang svn gnome org]

Author: jedywang
Date: Tue Dec  2 09:32:10 2008
New Revision: 3111
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3111&view=rev

Log:
2008-12-02  Wang Xin  <jedy wang sun com>

	* src/gpm-main.c: (main): Remove daemon code.



Modified:
   trunk/ChangeLog
   trunk/src/gpm-main.c

Modified: trunk/src/gpm-main.c
==============================================================================
--- trunk/src/gpm-main.c	(original)
+++ trunk/src/gpm-main.c	Tue Dec  2 09:32:10 2008
@@ -125,7 +125,6 @@
 	DBusGConnection *session_connection;
 	gboolean verbose = FALSE;
 	gboolean version = FALSE;
-	gboolean no_daemon = FALSE;
 	gboolean timed_exit = FALSE;
 	gboolean immediate_exit = FALSE;
 	GpmManager *manager = NULL;
@@ -133,8 +132,6 @@
 	GOptionContext *context;
 
 	const GOptionEntry options[] = {
-		{ "no-daemon", '\0', 0, G_OPTION_ARG_NONE, &no_daemon,
-		  N_("Do not daemonize"), NULL },
 		{ "verbose", '\0', 0, G_OPTION_ARG_NONE, &verbose,
 		  N_("Show extra debugging information"), NULL },
 		{ "version", '\0', 0, G_OPTION_ARG_NONE, &version,
@@ -176,10 +173,6 @@
 	gtk_init (&argc, &argv);
 	egg_debug_init (verbose);
 
-	/* we need to daemonize before we get a system connection to fix #366057 */
-	if (no_daemon == FALSE && daemon (0, 0))
-		egg_error ("Could not daemonize: %s", g_strerror (errno));
-
 	egg_debug ("GNOME %s %s", GPM_NAME, VERSION);
 
 	/* check dbus connections, exit if not valid */