diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-09-26 00:58:34 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-09-26 00:58:34 +0000 |
| commit | 730c8fa3a9c734950f171760f1b973d33dcdeb7a (patch) | |
| tree | 2e11110aff896f20728052520f18415c1b3ab131 /src | |
| parent | 2cd5440e93ea831f3ee4930e3e7baecdd5083e5a (diff) | |
| download | nautilus-730c8fa3a9c734950f171760f1b973d33dcdeb7a.tar.gz | |
Band-aid for bug 2752 (intermittent failure trying to
use Help Contents)
* src/nautilus-view-frame.c:
(nautilus_view_frame_load_client): Upped a hardcoded
timeout from 2 seconds to 10 seconds; also added an
assert that might help us fix the underlying problem
later.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nautilus-view-frame.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c index ba4a66bac..6645809d3 100644 --- a/src/nautilus-view-frame.c +++ b/src/nautilus-view-frame.c @@ -440,6 +440,7 @@ check_if_view_is_gone (gpointer data) CORBA_exception_init (&ev); ok = TRUE; if (CORBA_Object_non_existent (bonobo_object_corba_objref (BONOBO_OBJECT (view->client_object)), &ev)) { + /* FIXME bugzilla.eazel.com 1840: Is a destroy really sufficient here? Who does the unref? * See bug 1840 for one bad case this destroy is involved in. */ @@ -490,8 +491,12 @@ nautilus_view_frame_load_client (NautilusViewFrame *view, const char *iid) nautilus_view_frame_destroy_client (view); + CORBA_exception_init (&ev); + /* Store the object away. */ view->client_object = bonobo_object_client_from_corba (adapted); + g_assert (!CORBA_Object_non_existent (adapted, &ev)); + /* Get at our client's interfaces. */ control = bonobo_object_query_interface @@ -502,8 +507,6 @@ nautilus_view_frame_load_client (NautilusViewFrame *view, const char *iid) (BONOBO_OBJECT (view->client_object), "IDL:Nautilus/Zoomable:1.0"); - CORBA_exception_init (&ev); - /* Start with a view frame interface. */ view->view_frame = impl_Nautilus_ViewFrame__create (view, &ev); @@ -549,11 +552,11 @@ nautilus_view_frame_load_client (NautilusViewFrame *view, const char *iid) CORBA_exception_free (&ev); /* FIXME bugzilla.eazel.com 2456: - * Is a hard-coded 2-second timeout acceptable? + * Is a hard-coded timeout acceptable? */ g_assert (view->details->check_if_view_is_gone_timeout_id == 0); view->details->check_if_view_is_gone_timeout_id - = g_timeout_add (2000, check_if_view_is_gone, view); + = g_timeout_add (10000, check_if_view_is_gone, view); view->details->state = VIEW_FRAME_NO_LOCATION; return TRUE; |