On Fri, 2002-03-22 at 19:19, jacob berkman wrote: > this patch does 2 things: > > * fix a DOS-like thing where the session manager will keep > respawning gnome2-settings-daemon if you already have one running by > telling the SM to respawn us only after we know we are unique > > * run xscreensaver when we start up. i think this is the most > appropriate place for this. if you're unconvinced of this, i can > explain it better but i want to go home. > > this patch rules! > > anyway, lemme know if i can commit. Modulo the g_spawn issue that jrb mentioned, it looks good. Once that's changed, please commit. Thanks. > jacob > -- > "don't get me wrong, i think that radiohead are amazing. i love their > music and i love their ethos, but that thom yorke guy always seems to > be complaining." -- moby > ---- > > ? GNOME_SettingsDaemon-common.c > ? GNOME_SettingsDaemon-skels.c > ? GNOME_SettingsDaemon-stubs.c > ? GNOME_SettingsDaemon.h > ? GNOME_SettingsDaemon.server > ? gnome-settings-screensaver.c > ? gnome-settings-screensaver.h > Index: factory.c > =================================================================== > RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/factory.c,v > retrieving revision 1.2 > diff -u -r1.2 factory.c > --- factory.c 17 Mar 2002 21:20:04 -0000 1.2 > +++ factory.c 23 Mar 2002 00:16:26 -0000 > @@ -21,11 +21,6 @@ > gnome_program_init ("gnome2-settings-daemon", VERSION, LIBGNOMEUI_MODULE, > argc, argv, NULL); > > - session = gnome_master_client (); > - gnome_client_set_restart_command (session, 2, restart_argv); > - gnome_client_set_restart_style (session, GNOME_RESTART_IMMEDIATELY); > - gnome_client_set_priority (session, 5); > - > if (!bonobo_init (&argc, argv)) { > g_error (_("Could not initialize Bonobo")); > } > @@ -41,6 +36,11 @@ > g_warning ("Encountered problems registering the settings daemon with bonobo-activation. " > "Clients may not detect that the settings daemon is already running."); > } > + > + session = gnome_master_client (); > + gnome_client_set_restart_command (session, 2, restart_argv); > + gnome_client_set_restart_style (session, GNOME_RESTART_IMMEDIATELY); > + gnome_client_set_priority (session, 5); > > gtk_main(); > > Index: gnome-settings-daemon.c > =================================================================== > RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/gnome-settings-daemon.c,v > retrieving revision 1.17 > diff -u -r1.17 gnome-settings-daemon.c > --- gnome-settings-daemon.c 13 Mar 2002 17:31:20 -0000 1.17 > +++ gnome-settings-daemon.c 23 Mar 2002 00:16:26 -0000 > @@ -227,6 +227,9 @@ > gnome_settings_sound_init (client); > gnome_settings_wm_init (client); > > + /* just spawn xscreensaver. it's special. */ > + system ("xscreensaver -nosplash &"); > + > for (list = directories; list; list = list->next) > { > GError *error = NULL; -- ======================================================================== Bradford Hovinen Hacker http://primates.ximian.com/~hovinen/ Ximian Desktop team hovinen ximian com Ximian, Inc. Now what is history? It is the centuries of systematic explorations of the riddle of death, with a view to overcoming death. That's why people discover mathematical infinity and electromagnetic waves, that's why they write symphonies. - Boris Pasternak, Doctor Zhivago
Attachment:
signature.asc
Description: This is a digitally signed message part