applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tell the SM to restart us only after we know we're unique with

Browse source 
2002-03-25  jacob berkman  <jacob@ximian.com>

	* factory.c (main): tell the SM to restart us only after we know
	we're unique with bonobo-activation
This commit is contained in:
jacob berkman 2002-03-25 20:30:33 +00:00 • committed by Jacob Berkman
parent da000d4a08
commit fc7c0a3f27
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,8 @@
2002-03-25 jacob berkman <jacob@ximian.com>
* factory.c (main): tell the SM to restart us only after we know
we're unique with bonobo-activation
2002-03-17 Jonathan Blandford <jrb@redhat.com> 2002-03-17 Jonathan Blandford <jrb@redhat.com>
* gnome-settings-xsettings.c: Add keybindingtheme * gnome-settings-xsettings.c: Add keybindingtheme

10
gnome-settings-daemon/factory.c
View file

@ -21,11 +21,6 @@ int main (int argc, char *argv [])
gnome_program_init ("gnome2-settings-daemon", VERSION, LIBGNOMEUI_MODULE, gnome_program_init ("gnome2-settings-daemon", VERSION, LIBGNOMEUI_MODULE,
argc, argv, NULL); 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)) { if (!bonobo_init (&argc, argv)) {
g_error (_("Could not initialize Bonobo")); g_error (_("Could not initialize Bonobo"));
} }
@ -42,6 +37,11 @@ int main (int argc, char *argv [])
"Clients may not detect that the settings daemon is already running."); "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(); gtk_main();
return -1; return -1;