diff options
| author | Darin Adler <darin@src.gnome.org> | 2002-01-07 17:33:40 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2002-01-07 17:33:40 +0000 |
| commit | 4bf5e65ed8ebb2f5db26248e04a889a25ad2483c (patch) | |
| tree | 1f42a3a16249360b355918273511b0384cf201b4 | |
| parent | 25e8b156f33642373e1353a7beaa1ce902617275 (diff) | |
| download | nautilus-4bf5e65ed8ebb2f5db26248e04a889a25ad2483c.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file.c | 3 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-link.c | 2 |
3 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,14 @@ +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 diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 0e10212b0..5eb5ff733 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -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); diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c index d0a10ca62..e4fbb51f9 100644 --- a/libnautilus-private/nautilus-link.c +++ b/libnautilus-private/nautilus-link.c @@ -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) { |