diff options
| author | Paolo Borelli <pborelli@katamail.com> | 2007-10-25 10:25:12 +0000 |
|---|---|---|
| committer | Paolo Borelli <pborelli@src.gnome.org> | 2007-10-25 10:25:12 +0000 |
| commit | 6963da91f71b79a023be544fa48d32e2a3b2b2e1 (patch) | |
| tree | f1494529a3f0f7fc52347cbff56eb6b6cc09e039 | |
| parent | 3302679fd671d3873e2149be629a8a7ee0381ff9 (diff) | |
| download | nautilus-6963da91f71b79a023be544fa48d32e2a3b2b2e1.tar.gz | |
Plug some minor memory leaks.
2007-10-25 Paolo Borelli <pborelli@katamail.com>
* src/file-manager/fm-list-view.c:
* libnautilus-private/nautilus-icon-info.c:
* libnautilus-private/nautilus-file.c:
Plug some minor memory leaks.
svn path=/branches/gio-branch/; revision=13368
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file.c | 16 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-info.c | 2 | ||||
| -rw-r--r-- | src/file-manager/fm-list-view.c | 1 |
4 files changed, 16 insertions, 10 deletions
@@ -1,5 +1,12 @@ 2007-10-25 Paolo Borelli <pborelli@katamail.com> + * src/file-manager/fm-list-view.c: + * libnautilus-private/nautilus-icon-info.c: + * libnautilus-private/nautilus-file.c: + Plug some minor memory leaks. + +2007-10-25 Paolo Borelli <pborelli@katamail.com> + * src/nautilus-window-manage-view.c (location_has_really_changed): Fix a warning when switching view. diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 37fd29ca6..c5814afd7 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -358,8 +358,7 @@ nautilus_file_new_from_filename (NautilusDirectory *directory, file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL)); } - nautilus_directory_ref (directory); - file->details->directory = directory; + file->details->directory = nautilus_directory_ref (directory); file->details->name = eel_ref_str_new (filename); @@ -472,12 +471,10 @@ nautilus_file_new_from_info (NautilusDirectory *directory, file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL)); } - nautilus_directory_ref (directory); - file->details->directory = directory; + file->details->directory = nautilus_directory_ref (directory); update_info_and_name (file, info); - #ifdef NAUTILUS_FILE_DEBUG_REF DEBUG_REF_PRINTF("%10p ref'd", file); #endif @@ -1878,8 +1875,7 @@ nautilus_file_update_name_and_directory (NautilusFile *file, monitors = nautilus_directory_remove_file_monitors (old_directory, file); nautilus_directory_remove_file (old_directory, file); - nautilus_directory_ref (new_directory); - file->details->directory = new_directory; + file->details->directory = nautilus_directory_ref (new_directory); nautilus_directory_unref (old_directory); if (name) { @@ -5617,7 +5613,7 @@ nautilus_file_get_volume_free_space (NautilusFile *file) char *res; res = NULL; - + location = nautilus_file_get_location (file); info = g_file_query_filesystem_info (location, G_FILE_ATTRIBUTE_FS_FREE, NULL, NULL); if (info) { @@ -5625,8 +5621,10 @@ nautilus_file_get_volume_free_space (NautilusFile *file) free_space = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FS_FREE); res = g_format_file_size_for_display (free_space); } + g_object_unref (info); } - + g_object_unref (location); + return res; } diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c index e37ee67d0..fc6aac3bd 100644 --- a/libnautilus-private/nautilus-icon-info.c +++ b/libnautilus-private/nautilus-icon-info.c @@ -146,7 +146,7 @@ nautilus_icon_info_new_for_icon_info (GtkIconInfo *icon_info) if (gtk_icon_info_get_attach_points (icon_info, &points, &n_points)) { icon->n_attach_points = n_points; - icon->attach_points = g_memdup (points, n_points * sizeof (GdkPoint)); + icon->attach_points = points; } icon->display_name = g_strdup (gtk_icon_info_get_display_name (icon_info)); diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 451703326..7356e9d0c 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -1208,6 +1208,7 @@ apply_columns_settings (FMListView *list_view, GList *column_order, GList *visib gtk_tree_view_move_column_after (list_view->details->tree_view, l->data, prev_view_column); prev_view_column = l->data; } + g_list_free (view_columns); } static void |