gnome-power-manager r3112 - in branches/gnome-2-24: . src

[jedywang svn gnome org]

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

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

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



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/gpm-main.c

Modified: branches/gnome-2-24/src/gpm-main.c
==============================================================================
--- branches/gnome-2-24/src/gpm-main.c	(original)
+++ branches/gnome-2-24/src/gpm-main.c	Tue Dec  2 09:43:40 2008
@@ -137,7 +137,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;
@@ -146,8 +145,6 @@
  	GnomeProgram *program;
 
 	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,
@@ -198,11 +195,6 @@
 
 	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 */