Commit 0459d0d0 authored by Dave Camp's avatar Dave Camp Committed by Dave Camp

Unref target_uri before returning when eel_uri_is_trash

2002-08-12  Dave Camp  <dave@ximian.com>

	* libnautilus-private/nautilus-dnd.c:
	(nautilus_drag_default_drop_action_for_icons): Unref target_uri
	before returning when eel_uri_is_trash (target_uri_string).
	* libnautilus-private/nautilus-file-operations.c:
	(append_basename): Free the filename returned from
	gnome_vfs_uri_etract_short_name().
	* libnautilus-private/nautilus-theme.c: (attributes_free): Free
	the attributes struct.
	* libnautilus-private/nautilus-undo-manager.c: (finalize): Free
	the details struct.
	* src/nautilus-bookmark-list.c: (append_bookmark_node): Free the
	mime type string.
parent 1144bec3
2002-08-12 Dave Camp <dave@ximian.com>
* libnautilus-private/nautilus-dnd.c:
(nautilus_drag_default_drop_action_for_icons): Unref target_uri
before returning when eel_uri_is_trash (target_uri_string).
* libnautilus-private/nautilus-file-operations.c:
(append_basename): Free the filename returned from
gnome_vfs_uri_etract_short_name().
* libnautilus-private/nautilus-theme.c: (attributes_free): Free
the attributes struct.
* libnautilus-private/nautilus-undo-manager.c: (finalize): Free
the details struct.
* src/nautilus-bookmark-list.c: (append_bookmark_node): Free the
mime type string.
2002-08-12 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file.c (rename_guts):
......
......@@ -295,6 +295,11 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
if (actions & GDK_ACTION_MOVE) {
*action = GDK_ACTION_MOVE;
}
if (target_uri) {
gnome_vfs_uri_unref (target_uri);
}
return;
} else if (eel_str_has_prefix (target_uri_string, NAUTILUS_COMMAND_SPECIFIER)
......
......@@ -1645,11 +1645,15 @@ static GnomeVFSURI *
append_basename (const GnomeVFSURI *target_directory,
const GnomeVFSURI *source_directory)
{
const char *file_name;
char *file_name;
GnomeVFSURI *ret;
file_name = gnome_vfs_uri_extract_short_name (source_directory);
if (file_name != NULL) {
return gnome_vfs_uri_append_file_name (target_directory, file_name);
ret = gnome_vfs_uri_append_file_name (target_directory,
file_name);
g_free (file_name);
return ret;
}
return gnome_vfs_uri_dup (target_directory);
......
......@@ -654,6 +654,8 @@ attributes_free (gpointer data,
if (attributes->preview_pixbuf != NULL) {
g_object_unref (attributes->preview_pixbuf);
}
g_free (attributes);
}
void
......
......@@ -209,6 +209,8 @@ finalize (GObject *object)
manager = NAUTILUS_UNDO_MANAGER (object);
release_transaction (manager);
g_free (manager->details);
EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
}
......
......@@ -154,6 +154,7 @@ append_bookmark_node (gpointer data, gpointer user_data)
xmlSetProp (bookmark_node, "icon_name", icon_name);
nautilus_scalable_icon_unref (icon);
g_free (icon_uri);
g_free (icon_mime_type);
g_free (icon_name);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment