if we were already registered - due to a beautifuly inefficient activation

2001-12-06  Michael Meeks  <michael@ximian.com>

	* libnautilus/nautilus-view-standard-main.c
	(nautilus_view_standard_main_multi): if we were
	already registered - due to a beautifuly inefficient
	activation server race - just quit.
This commit is contained in:
Michael Meeks 2001-12-08 08:36:35 +00:00 committed by Michael Meeks
parent c9b8fca3c2
commit a0f24894de
2 changed files with 16 additions and 7 deletions

View file

@ -1,3 +1,10 @@
2001-12-06 Michael Meeks <michael@ximian.com>
* libnautilus/nautilus-view-standard-main.c
(nautilus_view_standard_main_multi): if we were
already registered - due to a beautifuly inefficient
activation server race - just quit.
2001-12-07 Darin Adler <darin@bentspoon.com>
* docs/design.txt:

View file

@ -238,13 +238,15 @@ nautilus_view_standard_main_multi (const char *executable_name,
#ifdef GNOME2_CONVERSION_COMPLETE
g_free (registration_id);
#endif
/* Loop until we have no more objects. */
do {
bonobo_main ();
} while (callback_data.object_count > 0 || callback_data.delayed_quit_timeout_id != 0);
/* Let the factory go. */
bonobo_object_unref (BONOBO_OBJECT (factory));
if (factory != NULL) {
/* Loop until we have no more objects. */
do {
bonobo_main ();
} while (callback_data.object_count > 0 || callback_data.delayed_quit_timeout_id != 0);
/* Let the factory go. */
bonobo_object_unref (BONOBO_OBJECT (factory));
}
gnome_vfs_shutdown ();