Commit 4bf5e65e authored by Darin Adler's avatar Darin Adler

Integrate patches from Frank Worsley <fworlsey@shaw.ca>.

	* libnautilus-private/nautilus-link.c:
	(get_link_style_for_mime_type): Fix porting mistake that caused all
	desktop files to be treated as Nautilus links.

	* libnautilus-private/nautilus-file.c: (rename_callback):
	Fix storage leak.
parent 25e8b156
2002-01-07 Darin Adler <darin@bentspoon.com>
Integrate patches from Frank Worsley <fworlsey@shaw.ca>.
* libnautilus-private/nautilus-link.c:
(get_link_style_for_mime_type): Fix porting mistake that caused all
desktop files to be treated as Nautilus links.
* libnautilus-private/nautilus-file.c: (rename_callback):
Fix storage leak.
2002-01-07 Dave Camp <dave@ximian.com>
* src/nautilus-theme-selector.c (theme_selector_finalize): Put
......
......@@ -951,6 +951,7 @@ rename_callback (GnomeVFSAsyncHandle *handle,
old_uri = nautilus_file_get_uri (op->file);
old_relative_uri = g_strdup (op->file->details->relative_uri);
update_info_and_name (op->file, new_info);
/* Self-owned files store their metadata under the
......@@ -962,6 +963,8 @@ rename_callback (GnomeVFSAsyncHandle *handle,
(directory, old_relative_uri, op->file->details->relative_uri);
}
g_free (old_relative_uri);
new_uri = nautilus_file_get_uri (op->file);
nautilus_directory_moved (old_uri, new_uri);
g_free (new_uri);
......
......@@ -58,7 +58,7 @@ static LinkStyle
get_link_style_for_mime_type (const char *mime_type)
{
if (mime_type != NULL) {
if (g_ascii_strcasecmp (mime_type, "application/x-nautilus-link") == 0) {
if (g_ascii_strcasecmp (mime_type, "application/x-gnome-app-info") == 0) {
return desktop;
}
if (g_ascii_strcasecmp (mime_type, "application/x-nautilus-link") == 0) {
......
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