summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@gnu.org>2001-08-23 16:48:19 +0000
committerAnders Carlsson <andersca@src.gnome.org>2001-08-23 16:48:19 +0000
commitbafee4405a146b093d8b2bab6732e079ea764e61 (patch)
tree4a0461d7bf9b4d11573a0f550b523404b022826e /src
parent1c50f7b1409cf0913281374daa1bd25756fb6566 (diff)
downloadnautilus-bafee4405a146b093d8b2bab6732e079ea764e61.tar.gz
Remove CONTROL_CENTER_REQUIRED since nautilus doesn't require
2001-08-23 Anders Carlsson <andersca@gnu.org> * nautilus.spec.in: Remove CONTROL_CENTER_REQUIRED since nautilus doesn't require control-center anymore. * configure.in: Remove CONTROL_CENTER_REQUIRED since nautilus doesn't require control-center anymore. * src/nautilus-window.c (nautilus_window_constructed): Set shrink to TRUE when adding the sidebar since it'll look better when the splitter is collapsed. (nautilus_window_destroy): Free the window title. * src/nautilus-window-manage-views.c (begin_location_change): Unref the directory when we're done using it. * src/nautilus-sidebar.c (nautilus_sidebar_destroy): Sink the title tab so it'll destroyed even if it hasn't got a parent. * libnautilus-private/nautilus-vfs-file.c (vfs_destroy): Free details struct. * libnautilus-private/nautilus-vfs-directory.c (vfs_destroy): Free details struct. * libnautilus-private/nautilus-mime-actions.c (nautilus_mime_get_short_list_applications_for_file): Free uri_scheme. (make_oaf_query_with_uri_scheme_only): Free explicit_iid_query. * libnautilus-private/nautilus-metafile.c (destroy): Unref the private vfs uri, and free the directory uri. * libnautilus-private/nautilus-file.c (nautilus_file_get_internal): Free the string returned by nautilus_directory_get_name_for_self_as_new_file. * libnautilus-private/nautilus-file-changes-queue.c (nautilus_file_changes_consume_changes): Free the change struct. * libnautilus-private/nautilus-directory-async.c (nautilus_directory_invalidate_count_and_mime_list): Unref the file after using it. * libnautilus/nautilus-idle-queue.c (execute_queued_functions): Free each list node. (nautilus_idle_queue_destroy): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/nautilus-information-panel.c2
-rw-r--r--src/nautilus-navigation-window.c4
-rw-r--r--src/nautilus-object-window.c4
-rw-r--r--src/nautilus-sidebar.c2
-rw-r--r--src/nautilus-spatial-window.c4
-rw-r--r--src/nautilus-window-manage-views.c3
-rw-r--r--src/nautilus-window.c4
7 files changed, 19 insertions, 4 deletions
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index 80a39be6f..6b57044e0 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -315,6 +315,8 @@ nautilus_sidebar_destroy (GtkObject *object)
nautilus_file_unref (sidebar->details->file);
}
+ gtk_object_sink (GTK_OBJECT (sidebar->details->title_tab));
+
g_free (sidebar->details->uri);
g_free (sidebar->details->default_background_color);
g_free (sidebar->details->default_background_image);
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 6f8a204fe..19c87dae5 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -760,7 +760,7 @@ nautilus_window_constructed (NautilusWindow *window)
go_to_callback, window);
e_paned_pack1 (E_PANED (window->content_hbox),
GTK_WIDGET (window->sidebar),
- FALSE, FALSE);
+ FALSE, TRUE);
#if 0
bonobo_ui_engine_add_sync (bonobo_window_get_ui_engine (BONOBO_WINDOW (window)),
sidebar_sync);
@@ -992,6 +992,8 @@ nautilus_window_destroy (GtkObject *object)
gtk_idle_remove (window->details->location_change_at_idle_id);
}
+ g_free (window->details->title);
+
g_free (window->details);
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index 6f8a204fe..19c87dae5 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -760,7 +760,7 @@ nautilus_window_constructed (NautilusWindow *window)
go_to_callback, window);
e_paned_pack1 (E_PANED (window->content_hbox),
GTK_WIDGET (window->sidebar),
- FALSE, FALSE);
+ FALSE, TRUE);
#if 0
bonobo_ui_engine_add_sync (bonobo_window_get_ui_engine (BONOBO_WINDOW (window)),
sidebar_sync);
@@ -992,6 +992,8 @@ nautilus_window_destroy (GtkObject *object)
gtk_idle_remove (window->details->location_change_at_idle_id);
}
+ g_free (window->details->title);
+
g_free (window->details);
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c
index 80a39be6f..6b57044e0 100644
--- a/src/nautilus-sidebar.c
+++ b/src/nautilus-sidebar.c
@@ -315,6 +315,8 @@ nautilus_sidebar_destroy (GtkObject *object)
nautilus_file_unref (sidebar->details->file);
}
+ gtk_object_sink (GTK_OBJECT (sidebar->details->title_tab));
+
g_free (sidebar->details->uri);
g_free (sidebar->details->default_background_color);
g_free (sidebar->details->default_background_image);
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 6f8a204fe..19c87dae5 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -760,7 +760,7 @@ nautilus_window_constructed (NautilusWindow *window)
go_to_callback, window);
e_paned_pack1 (E_PANED (window->content_hbox),
GTK_WIDGET (window->sidebar),
- FALSE, FALSE);
+ FALSE, TRUE);
#if 0
bonobo_ui_engine_add_sync (bonobo_window_get_ui_engine (BONOBO_WINDOW (window)),
sidebar_sync);
@@ -992,6 +992,8 @@ nautilus_window_destroy (GtkObject *object)
gtk_idle_remove (window->details->location_change_at_idle_id);
}
+ g_free (window->details->title);
+
g_free (window->details);
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 3cd9e85d0..271b65390 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -1398,6 +1398,7 @@ begin_location_change (NautilusWindow *window,
} else {
force_reload = !nautilus_directory_is_local (directory);
}
+
if (force_reload) {
nautilus_directory_force_reload (directory);
file = nautilus_directory_get_corresponding_file (directory);
@@ -1405,6 +1406,8 @@ begin_location_change (NautilusWindow *window,
nautilus_file_unref (file);
}
+ nautilus_directory_unref (directory);
+
window->details->determine_view_handle = nautilus_determine_initial_view
(location,
determined_initial_view_callback,
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 6f8a204fe..19c87dae5 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -760,7 +760,7 @@ nautilus_window_constructed (NautilusWindow *window)
go_to_callback, window);
e_paned_pack1 (E_PANED (window->content_hbox),
GTK_WIDGET (window->sidebar),
- FALSE, FALSE);
+ FALSE, TRUE);
#if 0
bonobo_ui_engine_add_sync (bonobo_window_get_ui_engine (BONOBO_WINDOW (window)),
sidebar_sync);
@@ -992,6 +992,8 @@ nautilus_window_destroy (GtkObject *object)
gtk_idle_remove (window->details->location_change_at_idle_id);
}
+ g_free (window->details->title);
+
g_free (window->details);
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));