Bug 169790: beagled shouldn't require an X server to run Index: beagled/BeagleDaemon.cs =================================================================== RCS file: /cvs/gnome/beagle/beagled/BeagleDaemon.cs,v retrieving revision 1.52 diff -u -B -p -r1.52 BeagleDaemon.cs --- beagled/BeagleDaemon.cs 9 Mar 2005 02:53:31 -0000 1.52 +++ beagled/BeagleDaemon.cs 10 Mar 2005 01:11:07 -0000 @@ -293,7 +293,7 @@ namespace Beagle.Daemon { try { Logger.Log.Debug ("Initializing D-BUS"); DBusisms.Init (); - Application.Init (); + Application.InitCheck ("beagled", ref args); Logger.Log.Debug ("Acquiring {0} D-BUS service", Beagle.DBusisms.Name); if (!DBusisms.InitService (Beagle.DBusisms.Name)) { Index: beagled/IndexHelper/IndexHelper.cs =================================================================== RCS file: /cvs/gnome/beagle/beagled/IndexHelper/IndexHelper.cs,v retrieving revision 1.7 diff -u -B -p -r1.7 IndexHelper.cs --- beagled/IndexHelper/IndexHelper.cs 6 Mar 2005 22:28:12 -0000 1.7 +++ beagled/IndexHelper/IndexHelper.cs 10 Mar 2005 01:11:07 -0000 @@ -55,7 +55,7 @@ namespace Beagle.IndexHelper { Logger.LogToFile (PathFinder.LogDir, "IndexHelper", run_by_hand || log_in_fg); Beagle.Daemon.DBusisms.Init (); - Application.Init (); + Application.InitCheck ("IndexHelper", ref args); // Keep an eye on the BusDriver so that we know if beagled // goes away. Index: glue/screensaver-glue.c =================================================================== RCS file: /cvs/gnome/beagle/glue/screensaver-glue.c,v retrieving revision 1.3 diff -u -B -p -r1.3 screensaver-glue.c --- glue/screensaver-glue.c 2 Dec 2004 22:48:31 -0000 1.3 +++ glue/screensaver-glue.c 10 Mar 2005 01:11:07 -0000 @@ -40,6 +40,9 @@ screensaver_info (int *state, int *kind, int retval; static int inited = 0; + if (GDK_DISPLAY () == NULL) + return 0; + /* FIXME: This should be called somewhere else. */ if (! inited) { gdk_threads_init ();