diff options
| author | Michael Meeks <michael@ximian.com> | 2001-11-15 07:06:10 +0000 |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2001-11-15 07:06:10 +0000 |
| commit | 89a3d817104bb6023ff6536c37f50bcaa5d74b2c (patch) | |
| tree | fd08b345f68c06eddd1f61e32e5a5f120b6e9dd6 /components/adapter | |
| parent | 5b8e3d4436ab3e1a811204d3aeef5af6b32b90b7 (diff) | |
| download | nautilus-89a3d817104bb6023ff6536c37f50bcaa5d74b2c.tar.gz | |
allow double destroys & split out (nautilus_tree_view_finalize): impl.
2001-11-13 Michael Meeks <michael@ximian.com>
* components/tree/nautilus-tree-view.c
(nautilus_tree_view_destroy): allow double destroys &
split out
(nautilus_tree_view_finalize): impl.
(nautilus_tree_view_class_init): upd.
* components/text/nautilus-text-view.c
(nautilus_text_view_class_init): upd.
(nautilus_text_view_destroy): allow double destroys.
(nautilus_text_view_finalize): impl.
* components/music/nautilus-music-view.c
(nautilus_music_view_class_init): upd.
(nautilus_music_view_destroy): upd.
(nautilus_music_view_finalize): impl.
* components/notes/nautilus-notes.c (do_destroy): don't
do hacks around the old bonobo.
* components/adapter/nautilus-adapter.c
(nautilus_adapter_new): don't gtk_signal_connect_object to a
BonoboObject.
Diffstat (limited to 'components/adapter')
| -rw-r--r-- | components/adapter/nautilus-adapter.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c index 5d0abb67c..6546e2dcd 100644 --- a/components/adapter/nautilus-adapter.c +++ b/components/adapter/nautilus-adapter.c @@ -152,10 +152,11 @@ nautilus_adapter_new (Bonobo_Unknown component) control = bonobo_control_new (bin); adapter->details->nautilus_view = nautilus_view_new_from_bonobo_control (control); - gtk_signal_connect_object (GTK_OBJECT (adapter->details->nautilus_view), - "destroy", - gtk_object_unref, - GTK_OBJECT (adapter)); + g_signal_connect_closure ( + G_OBJECT (adapter->details->nautilus_view), + "destroy", g_cclosure_new_swap ( + G_CALLBACK (g_object_unref), + G_OBJECT (adapter), NULL), 0); /* Get the class to handle embedding this kind of component. */ adapter->details->embed_strategy = nautilus_adapter_embed_strategy_get (component); @@ -170,8 +171,8 @@ nautilus_adapter_new (Bonobo_Unknown component) bonobo_object_add_interface (BONOBO_OBJECT (control), zoomable); g_signal_connect (control, "activate", - G_CALLBACK (nautilus_adapter_activate_callback), - adapter); + G_CALLBACK (nautilus_adapter_activate_callback), + adapter); g_signal_connect (adapter->details->embed_strategy, "open_location", nautilus_adapter_open_location_callback, adapter); |