diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-09-27 08:34:37 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-09-27 08:34:37 +0000 |
| commit | 08a74e90506c90f2cab4b2e94413e49186873339 (patch) | |
| tree | 71cbea26ae7fc28198dfc77c733305853592cc2c | |
| parent | e64d43ee5fd2183fa382237ab1dfa4b2525d6fda (diff) | |
| download | nautilus-08a74e90506c90f2cab4b2e94413e49186873339.tar.gz | |
Never warn if the files would be launched in the same app. Partially
2005-09-27 Alexander Larsson <alexl@redhat.com>
* src/file-manager/fm-directory-view.c:
(activate_check_mime_types):
Never warn if the files would be launched in the same app.
Partially reverts checkin from 2005-08-01.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 19 |
2 files changed, 21 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2005-09-27 Alexander Larsson <alexl@redhat.com> + + * src/file-manager/fm-directory-view.c: + (activate_check_mime_types): + Never warn if the files would be launched in the same app. + Partially reverts checkin from 2005-08-01. + 2005-09-26 Christian Neumair <chris@gnome-de.org> * libnautilus-private/nautilus-desktop-directory.c: diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 4c19a5665..798b7b508 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -4496,7 +4496,9 @@ activate_check_mime_types (FMDirectoryView *view, char *guessed_mime_type; char *mime_type; gboolean ret; - + GnomeVFSMimeApplication *default_app; + GnomeVFSMimeApplication *guessed_default_app; + if (!nautilus_file_check_if_ready (file, NAUTILUS_FILE_ATTRIBUTE_SLOW_MIME_TYPE)) { return FALSE; } @@ -4507,11 +4509,18 @@ activate_check_mime_types (FMDirectoryView *view, mime_type = nautilus_file_get_mime_type (file); if (gnome_vfs_mime_type_get_equivalence (mime_type, guessed_mime_type) == GNOME_VFS_MIME_UNRELATED) { - if (warn_on_mismatch) { - warn_mismatched_mime_types (view, file); + default_app = gnome_vfs_mime_get_default_application + (mime_type); + guessed_default_app = gnome_vfs_mime_get_default_application + (guessed_mime_type); + if (default_app != NULL && + guessed_default_app != NULL && + !gnome_vfs_mime_application_equal (default_app, guessed_default_app)) { + if (warn_on_mismatch) { + warn_mismatched_mime_types (view, file); + } + ret = FALSE; } - - ret = FALSE; } g_free (guessed_mime_type); |