diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-10-27 07:38:03 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-10-27 07:38:03 +0000 |
| commit | 7667579c0a92d7b367f6cf97df4e21a24f508ff5 (patch) | |
| tree | 148f72989290e4dfe8b26cf30973680d8d12e68d | |
| parent | 17dc50bdb62060b40abb4f3420333253cd899bd1 (diff) | |
| download | nautilus-7667579c0a92d7b367f6cf97df4e21a24f508ff5.tar.gz | |
Include locale.h to fix build. Patch from Nelson Benítez.
2005-10-27 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations.c:
Include locale.h to fix build. Patch from Nelson Benítez.
2005-10-27 Alexander Larsson <alexl@redhat.com>
* src/nautilus-window-menus.c: (action_connect_to_server_callback):
Fix leak. Patch from Kjartan Maraas. (#319333)
2005-10-27 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-mime-actions.c (get_open_with_mime_applications):
Correctly sort the mime lists.
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 1 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-mime-actions.c | 4 | ||||
| -rw-r--r-- | src/nautilus-window-menus.c | 6 |
4 files changed, 22 insertions, 4 deletions
@@ -1,3 +1,18 @@ +2005-10-27 Alexander Larsson <alexl@redhat.com> + + * libnautilus-private/nautilus-file-operations.c: + Include locale.h to fix build. Patch from Nelson Benítez. + +2005-10-27 Alexander Larsson <alexl@redhat.com> + + * src/nautilus-window-menus.c: (action_connect_to_server_callback): + Fix leak. Patch from Kjartan Maraas. (#319333) + +2005-10-27 Alexander Larsson <alexl@redhat.com> + + * libnautilus-private/nautilus-mime-actions.c (get_open_with_mime_applications): + Correctly sort the mime lists. + 2005-10-20 Christian Neumair <chris@gnome-de.org> * libnautilus-private/nautilus-program-choosing.c: diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index c2e58a8cf..f0c56da7e 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -27,6 +27,7 @@ #include <config.h> #include <string.h> #include <stdio.h> +#include <locale.h> #include "nautilus-file-operations.h" #include "nautilus-file-operations-progress.h" diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c index 2672a410a..723c78e76 100644 --- a/libnautilus-private/nautilus-mime-actions.c +++ b/libnautilus-private/nautilus-mime-actions.c @@ -150,7 +150,7 @@ get_open_with_mime_applications (NautilusFile *file) uri = nautilus_file_get_uri (file); result = gnome_vfs_mime_get_all_applications_for_uri (uri, mime_type); - g_list_sort (result, (GCompareFunc) application_compare_by_name); + result = g_list_sort (result, (GCompareFunc) application_compare_by_name); if (strcmp (guessed_mime_type, mime_type) != 0) { GList *result_2; @@ -203,7 +203,7 @@ nautilus_mime_get_applications_for_file (NautilusFile *file) } mime_type = nautilus_file_get_mime_type (file); result = gnome_vfs_mime_get_all_applications (mime_type); - g_list_sort (result, (GCompareFunc) application_compare_by_name); + result = g_list_sort (result, (GCompareFunc) application_compare_by_name); return filter_nautilus_handler (result); } diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index 1fea2e7c8..288a871c6 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -219,8 +219,10 @@ action_connect_to_server_callback (GtkAction *action, { NautilusWindow *window = NAUTILUS_WINDOW (user_data); GtkWidget *dialog; - - dialog = nautilus_connect_server_dialog_new (window, nautilus_window_get_location (window)); + char *location; + location = nautilus_window_get_location (window); + dialog = nautilus_connect_server_dialog_new (window, location); + g_free (location); gtk_widget_show (dialog); } |