diff options
| author | Maciej Stachowiak <mstachow@src.gnome.org> | 2001-02-09 02:42:25 +0000 |
|---|---|---|
| committer | Maciej Stachowiak <mstachow@src.gnome.org> | 2001-02-09 02:42:25 +0000 |
| commit | f6e7747d9fa8bed47b4e87da8b4d4256d8be150f (patch) | |
| tree | 6ca39c6d80f761c1fa6b07a7410adf5c4dcdfac2 | |
| parent | d8e3e28cea69c2f0b44c100c679b06712272f256 (diff) | |
| download | nautilus-f6e7747d9fa8bed47b4e87da8b4d4256d8be150f.tar.gz | |
reviewed by: Rebecca Schulman <rebecka@eazel.com>
reviewed by: Rebecca Schulman <rebecka@eazel.com>
This change is needed to enable the bonobo-level fix to Nautilus
bug 6023 (throbber and proxy processes still around after Nautilus
is quit). The throbber was unreffing itself on destroy, which is
wrong. However, Bonobo was leaking a reference to any toolbar
control item, so the two bugs were masking each other.
* components/throbber/nautilus-throbber.c
(nautilus_throbber_destroy): Remove incorrect unref.
(nautilus_throbber_initialize): Formatting tweaks
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | components/throbber/nautilus-throbber.c | 11 |
2 files changed, 18 insertions, 7 deletions
@@ -1,3 +1,17 @@ +2001-02-07 Maciej Stachowiak <mjs@eazel.com> + + reviewed by: Rebecca Schulman <rebecka@eazel.com> + + This change is needed to enable the bonobo-level fix to Nautilus + bug 6023 (throbber and proxy processes still around after Nautilus + is quit). The throbber was unreffing itself on destroy, which is + wrong. However, Bonobo was leaking a reference to any toolbar + control item, so the two bugs were masking each other. + + * components/throbber/nautilus-throbber.c + (nautilus_throbber_destroy): Remove incorrect unref. + (nautilus_throbber_initialize): Formatting tweaks + 2001-02-08 Andy Hertzfeld <andy@eazel.com> * libnautilus-extensions/nautilus-gnome-extensions.c: diff --git a/components/throbber/nautilus-throbber.c b/components/throbber/nautilus-throbber.c index bef0fda0a..985d275db 100644 --- a/components/throbber/nautilus-throbber.c +++ b/components/throbber/nautilus-throbber.c @@ -200,11 +200,6 @@ nautilus_throbber_destroy (GtkObject *object) bonobo_object_unref (BONOBO_OBJECT (throbber->details->property_bag)); } - if (throbber->details->control) { - bonobo_object_unref (BONOBO_OBJECT (throbber->details->control)); - } - - g_free (throbber->details); NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); @@ -292,8 +287,10 @@ nautilus_throbber_initialize (NautilusThrobber *throbber) throbber->details->control = (BonoboObject*) bonobo_control_new (box); /* attach a property bag with the configure property */ - throbber->details->property_bag = bonobo_property_bag_new (get_bonobo_properties, set_bonobo_properties, throbber); - bonobo_control_set_properties (BONOBO_CONTROL(throbber->details->control), throbber->details->property_bag); + throbber->details->property_bag = bonobo_property_bag_new (get_bonobo_properties, + set_bonobo_properties, throbber); + bonobo_control_set_properties (BONOBO_CONTROL (throbber->details->control), + throbber->details->property_bag); bonobo_property_bag_add (throbber->details->property_bag, "throbbing", THROBBING, BONOBO_ARG_BOOLEAN, NULL, "Throbber active", 0); |