diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-10-13 10:09:00 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-10-13 10:09:00 +0000 |
| commit | 6b5cfd214f47d8fa3e66194ae18713dd06229993 (patch) | |
| tree | 9a130aec68e24a97514364fe9c0023ed27333e9f | |
| parent | 0ae4c5e399514be7b2758d74e452f55793d81d54 (diff) | |
| download | nautilus-6b5cfd214f47d8fa3e66194ae18713dd06229993.tar.gz | |
Merged from trunk:
2008-10-13 Alexander Larsson <alexl@redhat.com>
Merged from trunk:
* libnautilus-private/nautilus-open-with-dialog.c:
(add_or_find_application):
Don't set default when opening with other app, just
add to open with list.
svn path=/branches/gnome-2-24/; revision=14723
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-open-with-dialog.c | 6 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2008-10-13 Alexander Larsson <alexl@redhat.com> + + Merged from trunk: + + * libnautilus-private/nautilus-open-with-dialog.c: + (add_or_find_application): + Don't set default when opening with other app, just + add to open with list. + 2008-10-11 Christian Neumair <cneumair@gnome.org> * libnautilus-private/nautilus-file-operations.c diff --git a/libnautilus-private/nautilus-open-with-dialog.c b/libnautilus-private/nautilus-open-with-dialog.c index e0e4e399e..4b54dd5db 100644 --- a/libnautilus-private/nautilus-open-with-dialog.c +++ b/libnautilus-private/nautilus-open-with-dialog.c @@ -242,9 +242,9 @@ add_or_find_application (NautilusOpenWithDialog *dialog) if (dialog->details->content_type) { - success = g_app_info_set_as_default_for_type (app, - dialog->details->content_type, - &error); + success = g_app_info_add_supports_type (app, + dialog->details->content_type, + &error); } else { success = g_app_info_set_as_default_for_extension (app, dialog->details->extension, |