diff options
author | Michael Meeks <michael@ximian.com> | 2002-02-19 10:51:08 +0000 |
---|---|---|
committer | Michael Meeks <michael@src.gnome.org> | 2002-02-19 10:51:08 +0000 |
commit | efac48236b4ce8560b4dfacc20bbd80757d17901 (patch) | |
tree | f1b8eebf9f3a05f46dd67169b5708adbdb95971b /libnautilus-private/nautilus-icon-container.c | |
parent | b99fa35032b4bfae4b4ea1d7d5721ba187efb104 (diff) | |
download | nautilus-efac48236b4ce8560b4dfacc20bbd80757d17901.tar.gz |
ensure we survive without trashing the WM, even if we can get no working
2002-02-19 Michael Meeks <michael@ximian.com>
* src/nautilus-window-manage-views.c
(determined_initial_view_callback): ensure we survive
without trashing the WM, even if we can get no working
mime data at all.
* libnautilus-private/nautilus-icon-container.c
(nautilus_icon_container_init): g_signal_connect_object
is not like gtk_signal_connect_object_while_alive, it's
missing a vital arg. swap.
Diffstat (limited to 'libnautilus-private/nautilus-icon-container.c')
-rw-r--r-- | libnautilus-private/nautilus-icon-container.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index f256557bf..8a4c7c69a 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -3363,11 +3363,13 @@ nautilus_icon_container_init (NautilusIconContainer *container) nautilus_icon_dnd_init (container, stipple); /* Make sure that we find out if the icons change. */ - g_signal_connect_object + g_signal_connect_closure (nautilus_icon_factory_get (), - "icons_changed", - G_CALLBACK (nautilus_icon_container_request_update_all), - container, 0); + "icons_changed", + g_cclosure_new_object_swap ( + G_CALLBACK (nautilus_icon_container_request_update_all), + G_OBJECT (container)), + FALSE); /* when the background changes, we must set up the label text color */ background = eel_get_widget_background (GTK_WIDGET (container)); |