diff options
22 files changed, 113 insertions, 17 deletions
@@ -1,3 +1,51 @@ +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. + 2001-08-22 Ramiro Estrugo <ramiro@fateware.com> reviewed by: <delete if not using a buddy> diff --git a/configure.in b/configure.in index 91df7d7eb..c35aba426 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,6 @@ dnl dnl ========================================================================== BONOBO_REQUIRED=0.37 -CONTROL_CENTER_REQUIRED=1.3 EEL_REQUIRED=1.0 ESOUND_REQUIRED=0.2.22 FREETYPE_LIBRARY_REQUIRED=6.1.0 @@ -421,9 +420,6 @@ LIBS=$GNOMEUI_LIBS AC_CHECK_FUNCS(gnome_canvas_set_dither) LIBS="$_libs" -dnl control center -NAUTILUS_VERSION_INSIST(control-center, $GNOME_CONFIG --modversion capplet | awk -F- '{print $2}', >=, CONTROL_CENTER_REQUIRED) - dnl Bonobo NAUTILUS_VERSION_INSIST(bonobo, $GNOME_CONFIG --modversion bonobo | awk -F- '{print $2}', >=, BONOBO_REQUIRED) diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index dae53d2c1..f7ccad7c6 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -1915,6 +1915,8 @@ nautilus_directory_invalidate_count_and_mime_list (NautilusDirectory *directory) if (file != NULL) { nautilus_file_invalidate_count_and_mime_list (file); } + + nautilus_file_unref (file); } static void diff --git a/libnautilus-private/nautilus-file-changes-queue.c b/libnautilus-private/nautilus-file-changes-queue.c index 7fd5a9118..d85649b36 100644 --- a/libnautilus-private/nautilus-file-changes-queue.c +++ b/libnautilus-private/nautilus-file-changes-queue.c @@ -545,7 +545,7 @@ nautilus_file_changes_consume_changes (gboolean consume_all) g_assert_not_reached (); break; } - change->from_uri = NULL; - change->to_uri = NULL; + + g_free (change); } } diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 4863fc7e8..af6b17ff7 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -299,7 +299,7 @@ nautilus_file_new_from_info (NautilusDirectory *directory, static NautilusFile * nautilus_file_get_internal (const char *uri, gboolean create) { - char *canonical_uri, *directory_uri, *relative_uri; + char *canonical_uri, *directory_uri, *relative_uri, *file_name; gboolean self_owned; GnomeVFSURI *vfs_uri, *directory_vfs_uri; NautilusDirectory *directory; @@ -358,8 +358,9 @@ nautilus_file_get_internal (const char *uri, gboolean create) if (vfs_uri == NULL) { g_assert (self_owned); if (directory != NULL) { - relative_uri = gnome_vfs_escape_string - (nautilus_directory_get_name_for_self_as_new_file (directory)); + file_name = nautilus_directory_get_name_for_self_as_new_file (directory); + relative_uri = gnome_vfs_escape_string (file_name); + g_free (file_name); } } diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index 8e30feae7..bc7276655 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -1015,6 +1015,7 @@ get_themed_icon_file_path (const char *theme_name, /* Return the path if the file exists. */ if (path != NULL) { + g_free (partial_path); break; } @@ -1512,6 +1513,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie g_free (file_path); } g_free (directory); + g_free (directory_uri); g_free (desktop_directory); } diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c index 6670ebda9..9d8b6825d 100644 --- a/libnautilus-private/nautilus-metafile.c +++ b/libnautilus-private/nautilus-metafile.c @@ -240,7 +240,10 @@ destroy (GtkObject *object) if (metafile->details->private_vfs_uri != NULL) { gnome_vfs_uri_unref (metafile->details->private_vfs_uri); } - + if (metafile->details->directory_vfs_uri != NULL) { + gnome_vfs_uri_unref (metafile->details->directory_vfs_uri); + } + g_hash_table_remove (metafiles, metafile->details->directory_uri); metafile_free_metadata (metafile); @@ -248,6 +251,8 @@ destroy (GtkObject *object) g_assert (metafile->details->write_idle_id == 0); + g_free (metafile->details->directory_uri); + g_free (metafile->details); EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c index 820e1e14d..dc2cfda09 100644 --- a/libnautilus-private/nautilus-mime-actions.c +++ b/libnautilus-private/nautilus-mime-actions.c @@ -486,7 +486,8 @@ nautilus_mime_get_short_list_applications_for_file (NautilusFile *file) result = eel_g_list_partition (result, application_supports_uri_scheme, uri_scheme, &removed); gnome_vfs_mime_application_list_free (removed); - + g_free (uri_scheme); + metadata_application_add_ids = nautilus_file_get_metadata_list (file, NAUTILUS_METADATA_KEY_SHORT_LIST_APPLICATION_ADD, @@ -1444,6 +1445,8 @@ make_oaf_query_with_uri_scheme_only (const char *uri_scheme, , explicit_iid_query, extra_requirements != NULL ? extra_requirements : "true"); + g_free (explicit_iid_query); + return result; } diff --git a/libnautilus-private/nautilus-trash-directory.c b/libnautilus-private/nautilus-trash-directory.c index 777dddd0e..4c3e827d1 100644 --- a/libnautilus-private/nautilus-trash-directory.c +++ b/libnautilus-private/nautilus-trash-directory.c @@ -192,6 +192,8 @@ add_volume (NautilusTrashDirectory *trash, (&trash_volume->handle, &vfs_uri_as_list, GNOME_VFS_DIRECTORY_KIND_TRASH, FALSE, TRUE, 0777, find_directory_callback, trash_volume); + + gnome_vfs_uri_unref (volume_mount_uri); } static void diff --git a/libnautilus-private/nautilus-vfs-directory.c b/libnautilus-private/nautilus-vfs-directory.c index ecb142d0f..66b3fffca 100644 --- a/libnautilus-private/nautilus-vfs-directory.c +++ b/libnautilus-private/nautilus-vfs-directory.c @@ -55,6 +55,12 @@ nautilus_vfs_directory_initialize (gpointer object, gpointer klass) static void vfs_destroy (GtkObject *object) { + NautilusVFSDirectory *directory; + + directory = NAUTILUS_VFS_DIRECTORY (object); + + g_free (directory->details); + EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/libnautilus-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c index f33ac3795..3036cbc15 100644 --- a/libnautilus-private/nautilus-vfs-file.c +++ b/libnautilus-private/nautilus-vfs-file.c @@ -245,6 +245,12 @@ nautilus_vfs_file_initialize (gpointer object, gpointer klass) static void vfs_destroy (GtkObject *object) { + NautilusVFSFile *file; + + file = NAUTILUS_VFS_FILE (object); + + g_free (file->details); + EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } diff --git a/libnautilus-private/nautilus-view-identifier.c b/libnautilus-private/nautilus-view-identifier.c index 7dbff08a8..69526c3c5 100644 --- a/libnautilus-private/nautilus-view-identifier.c +++ b/libnautilus-private/nautilus-view-identifier.c @@ -184,6 +184,13 @@ nautilus_view_identifier_new_from_content_view (OAF_ServerInfo *server) } NautilusViewIdentifier * +nautilus_view_identifier_new_from_property_page (OAF_ServerInfo *server) +{ + return nautilus_view_identifier_new_from_oaf_server_info + (server, "nautilus:property_page_name"); +} + +NautilusViewIdentifier * nautilus_view_identifier_new_from_sidebar_panel (OAF_ServerInfo *server) { return nautilus_view_identifier_new_from_oaf_server_info diff --git a/libnautilus-private/nautilus-view-identifier.h b/libnautilus-private/nautilus-view-identifier.h index 787a5bb74..e2d7d05a9 100644 --- a/libnautilus-private/nautilus-view-identifier.h +++ b/libnautilus-private/nautilus-view-identifier.h @@ -38,6 +38,7 @@ NautilusViewIdentifier *nautilus_view_identifier_new_from_oaf_server_info (OAF_S char *name_attribute); NautilusViewIdentifier *nautilus_view_identifier_new_from_content_view (OAF_ServerInfo *server); NautilusViewIdentifier *nautilus_view_identifier_new_from_sidebar_panel (OAF_ServerInfo *server); +NautilusViewIdentifier *nautilus_view_identifier_new_from_property_page (OAF_ServerInfo *server); NautilusViewIdentifier *nautilus_view_identifier_copy (const NautilusViewIdentifier *identifier); void nautilus_view_identifier_free (NautilusViewIdentifier *identifier); int nautilus_view_identifier_compare (const NautilusViewIdentifier *a, diff --git a/libnautilus/nautilus-idle-queue.c b/libnautilus/nautilus-idle-queue.c index 80d9e3b61..5d9e9d3cd 100644 --- a/libnautilus/nautilus-idle-queue.c +++ b/libnautilus/nautilus-idle-queue.c @@ -68,6 +68,8 @@ execute_queued_functions (gpointer callback_data) if (function->free_callback_data != NULL) { (* function->free_callback_data) (function->callback_data); } + + g_free (function); } g_list_free (functions); @@ -128,6 +130,8 @@ nautilus_idle_queue_destroy (NautilusIdleQueue *queue) if (function->free_callback_data != NULL) { (* function->free_callback_data) (function->callback_data); } + + g_free (function); } g_list_free (queue->functions); diff --git a/nautilus.spec.in b/nautilus.spec.in index c0cf026df..c45ecc4fd 100644 --- a/nautilus.spec.in +++ b/nautilus.spec.in @@ -32,7 +32,6 @@ Requires: medusa >= @MEDUSA_REQUIRED@ Requires: esound >= @ESOUND_REQUIRED@ Requires: scrollkeeper >= @SCROLLKEEPER_REQUIRED@ Requires: libpng -Requires: control-center >= @CONTROL_CENTER_REQUIRED@ Requires: librsvg >= @LIBRSVG_REQUIRED@ Requires: eel >= @EEL_REQUIRED@ @@ -53,7 +52,6 @@ BuildRequires: medusa-devel >= @MEDUSA_REQUIRED@ BuildRequires: esound-devel >= @ESOUND_REQUIRED@ BuildRequires: scrollkeeper >= @SCROLLKEEPER_REQUIRED@ BuildRequires: libpng-devel -BuildRequires: control-center-devel >= @CONTROL_CENTER_REQUIRED@ BuildRequires: librsvg-devel >= @LIBRSVG_REQUIRED@ BuildRequires: eel-devel >= @EEL_REQUIRED@ BuildRequires: mozilla-devel >= 0.8 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)); |