diff options
| author | John Harper <jsh@eazel.com> | 2001-03-02 05:43:30 +0000 |
|---|---|---|
| committer | John Harper <jsh@src.gnome.org> | 2001-03-02 05:43:30 +0000 |
| commit | 99056d64f8b117d739fa3e495202dc23d10779cb (patch) | |
| tree | 5760b734d4e4f11dcbcec435257415d1de66f920 | |
| parent | 2d9e9b3245cd0c24c48a02db06737194bb4e27fb (diff) | |
| download | nautilus-99056d64f8b117d739fa3e495202dc23d10779cb.tar.gz | |
reviewed by: Maciej Stachowiak <mjs@eazel.com>
2001-03-01 John Harper <jsh@eazel.com>
reviewed by: Maciej Stachowiak <mjs@eazel.com>
Fixed bug 7238 ("View as EOG Image" adds toolbar icons that
don't go away):
* components/adapter/nautilus-adapter.c
(nautilus_adapter_destroy): when the adapter has a non-null
embedding strategy, deactivate it before destroying
I think there may be a refcounting problem in EOG that caused
the original problem, but the above should always be safe, and
will protect nautilus from misbehaving components
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | components/adapter/nautilus-adapter.c | 4 |
2 files changed, 19 insertions, 0 deletions
@@ -1,3 +1,18 @@ +2001-03-01 John Harper <jsh@eazel.com> + + reviewed by: Maciej Stachowiak <mjs@eazel.com> + + Fixed bug 7238 ("View as EOG Image" adds toolbar icons that + don't go away): + + * components/adapter/nautilus-adapter.c + (nautilus_adapter_destroy): when the adapter has a non-null + embedding strategy, deactivate it before destroying + + I think there may be a refcounting problem in EOG that caused + the original problem, but the above should always be safe, and + will protect nautilus from misbehaving components + 2001-03-01 Mike Fleming <mfleming@eazel.com> reviewed by: <ian@eazel.com> diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c index 40648640f..87d1d4641 100644 --- a/components/adapter/nautilus-adapter.c +++ b/components/adapter/nautilus-adapter.c @@ -128,6 +128,10 @@ nautilus_adapter_destroy (GtkObject *object) gtk_signal_disconnect (GTK_OBJECT (adapter->details->load_strategy), adapter->details->report_load_failed_id); + if (adapter->details->embed_strategy != NULL) { + nautilus_adapter_embed_strategy_deactivate (adapter->details->embed_strategy); + } + if (adapter->details->load_strategy != NULL) { nautilus_adapter_load_strategy_stop_loading (adapter->details->load_strategy); gtk_object_unref (GTK_OBJECT (adapter->details->load_strategy)); |