diff options
| author | Anders Carlsson <andersca@gnu.org> | 2002-04-17 13:46:11 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@src.gnome.org> | 2002-04-17 13:46:11 +0000 |
| commit | 82836cbb165f0cabee006d342de3cf0654e77f51 (patch) | |
| tree | 8e5fdf2128ce9bd3b526ede4ebcb84551f14e039 | |
| parent | fafef2d5d8230868fb5779bb570ea8a4bd048b2f (diff) | |
| download | nautilus-82836cbb165f0cabee006d342de3cf0654e77f51.tar.gz | |
Use ::finalize instead of ::destroy so we don't free data twice.
2002-04-17 Anders Carlsson <andersca@gnu.org>
* components/hardware/nautilus-hardware-view.c:
(nautilus_hardware_view_class_init),
(nautilus_hardware_view_finalize):
Use ::finalize instead of ::destroy so we don't free
data twice.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | components/hardware/nautilus-hardware-view.c | 12 |
2 files changed, 14 insertions, 6 deletions
@@ -1,5 +1,13 @@ 2002-04-17 Anders Carlsson <andersca@gnu.org> + * components/hardware/nautilus-hardware-view.c: + (nautilus_hardware_view_class_init), + (nautilus_hardware_view_finalize): + Use ::finalize instead of ::destroy so we don't free + data twice. + +2002-04-17 Anders Carlsson <andersca@gnu.org> + * libnautilus-private/nautilus-volume-monitor.c: (nautilus_file_system_type_free): Remove debugging output. diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c index 4259cce1c..9edb9bd86 100644 --- a/components/hardware/nautilus-hardware-view.c +++ b/components/hardware/nautilus-hardware-view.c @@ -86,7 +86,7 @@ static void nautilus_hardware_view_drag_data_received (GtkWidget guint time); static void nautilus_hardware_view_class_init (NautilusHardwareViewClass *klass); static void nautilus_hardware_view_init (NautilusHardwareView *view); -static void nautilus_hardware_view_destroy (GtkObject *object); +static void nautilus_hardware_view_finalize (GObject *object); static void hardware_view_load_location_callback (NautilusView *view, const char *location, NautilusHardwareView *hardware_view); @@ -100,13 +100,13 @@ EEL_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, GTK_TYPE_EV static void nautilus_hardware_view_class_init (NautilusHardwareViewClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; GtkWidgetClass *widget_class; - object_class = GTK_OBJECT_CLASS (klass); + object_class = G_OBJECT_CLASS (klass); widget_class = GTK_WIDGET_CLASS (klass); - object_class->destroy = nautilus_hardware_view_destroy; + object_class->finalize = nautilus_hardware_view_finalize; widget_class->drag_data_received = nautilus_hardware_view_drag_data_received; } @@ -185,7 +185,7 @@ nautilus_hardware_view_init (NautilusHardwareView *hardware_view) } static void -nautilus_hardware_view_destroy (GtkObject *object) +nautilus_hardware_view_finalize (GObject *object) { NautilusHardwareView *hardware_view; @@ -199,7 +199,7 @@ nautilus_hardware_view_destroy (GtkObject *object) g_free (hardware_view->details); - EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); + EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); } /* Component embedding support */ |