Commit a8bb3c5d authored by Michael Meeks's avatar Michael Meeks

guard window creation to avoid re-enterancy, via. other shell calls to


	* src/nautilus-application.c
	(nautilus_application_create_desktop_window):
	guard window creation to avoid re-enterancy, via.
	other shell calls to create windows.

	* src/nautilus-main.c (main): vfs and bonobo init
	is done for us by gnome_program_init.

	* src/nautilus-view-frame.c
	(nautilus_view_frame_selection_changed),
	(send_history): check we have a listener before
	constructing potentially large and slow change
	notifications.

	* configure.in: require bonobo 1.113.0 where we have
	the event source acceleration.
parent 13128be2
2002-03-18 Michael Meeks <michael@ximian.com>
* src/nautilus-application.c
(nautilus_application_create_desktop_window):
guard window creation to avoid re-enterancy, via.
other shell calls to create windows.
* src/nautilus-main.c (main): vfs and bonobo init
is done for us by gnome_program_init.
* src/nautilus-view-frame.c
(nautilus_view_frame_selection_changed),
(send_history): check we have a listener before
constructing potentially large and slow change
notifications.
* configure.in: require bonobo 1.113.0 where we have
the event source acceleration.
2002-03-17 Darin Adler <darin@bentspoon.com>
* configure.in: Bump required versions.
......
......@@ -4,7 +4,7 @@ dnl ===========================================================================
ART_REQUIRED=2.3.6
BONOBO_ACTIVATION_REQUIRED=0.9.3
BONOBO_REQUIRED=1.110
BONOBO_REQUIRED=1.113
BONOBO_UI_REQUIRED=1.110.2
EEL_REQUIRED=1.1.8
ESOUND_REQUIRED=0.2.23
......
......@@ -5700,7 +5700,6 @@ real_size_allocate (GtkWidget *widget,
GtkAllocation allocation_to_fool_scrolled_window;
/* Trick GtkScrolledWindow into working. */
allocation_to_fool_scrolled_window.x = 0;
allocation_to_fool_scrolled_window.y = 0;
allocation_to_fool_scrolled_window.width = allocation->width;
......
......@@ -576,10 +576,21 @@ nautilus_application_startup (NautilusApplication *application,
static void
nautilus_application_create_desktop_window (NautilusApplication *application)
{
static gboolean create_in_progress = FALSE;
g_return_if_fail (nautilus_application_desktop_window == NULL);
g_return_if_fail (NAUTILUS_IS_APPLICATION (application));
if (create_in_progress) {
return;
}
create_in_progress = TRUE;
nautilus_application_desktop_window = nautilus_desktop_window_new (application);
create_in_progress = FALSE;
gtk_widget_show (GTK_WIDGET (nautilus_application_desktop_window));
}
......
......@@ -216,8 +216,6 @@ main (int argc, char *argv[])
/* Initialize the services that we use. */
LIBXML_TEST_VERSION
gnome_vfs_init ();
bonobo_ui_init ("nautilus", VERSION, &argc, argv);
if (g_getenv ("NAUTILUS_ENABLE_TEST_COMPONENTS") != NULL) {
bonobo_activation_set_test_components_enabled (TRUE);
......
......@@ -153,10 +153,14 @@ nautilus_view_frame_init (NautilusViewFrame *view)
view->details->idle_queue = nautilus_idle_queue_new ();
g_signal_connect_object (nautilus_signaller_get_current (), "history_list_changed",
G_CALLBACK (send_history), view, G_CONNECT_SWAPPED);
g_signal_connect_object (nautilus_icon_factory_get (), "icons_changed",
G_CALLBACK (send_history), view, G_CONNECT_SWAPPED);
g_signal_connect_object (nautilus_signaller_get_current (),
"history_list_changed",
G_CALLBACK (send_history),
view, G_CONNECT_SWAPPED);
g_signal_connect_object (nautilus_icon_factory_get (),
"icons_changed",
G_CALLBACK (send_history),
view, G_CONNECT_SWAPPED);
}
static void
......@@ -854,6 +858,12 @@ nautilus_view_frame_selection_changed (NautilusViewFrame *view,
return;
}
if (!bonobo_event_source_has_listener
(view->details->event_source,
"Bonobo/Property:change:selection")) {
return;
}
uri_list = nautilus_uri_list_from_g_list (selection);
CORBA_exception_init (&ev);
......@@ -1319,6 +1329,12 @@ send_history (NautilusViewFrame *view)
return;
}
if (!bonobo_event_source_has_listener
(view->details->event_source,
"Bonobo/Property:change:history")) {
return;
}
history = get_history_list (view);
if (history == CORBA_OBJECT_NIL) {
return;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment