summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2004-07-16 11:43:24 +0000
committerAlexander Larsson <alexl@src.gnome.org>2004-07-16 11:43:24 +0000
commit68b25b6493012008729eb1d8059f7829cb1768c6 (patch)
tree2985c59b64127a38b69bb1287636f51b40bb0e2a
parent4a3d28579c04c7f70b3be97962d5f79e4a8315da (diff)
downloadnautilus-68b25b6493012008729eb1d8059f7829cb1768c6.tar.gz
Check for more NULL cases.
2004-07-09 Alexander Larsson <alexl@redhat.com> * src/file-manager/fm-directory-view.c (activate_check_mime_types): Check for more NULL cases.
-rw-r--r--ChangeLog5
-rw-r--r--src/file-manager/fm-directory-view.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0be5dab9f..9ccb0a630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-09 Alexander Larsson <alexl@redhat.com>
+
+ * src/file-manager/fm-directory-view.c (activate_check_mime_types):
+ Check for more NULL cases.
+
2004-07-07 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations.c (handle_transfer_overwrite):
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 6676673d1..fd3a4c601 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -4038,7 +4038,9 @@ activate_check_mime_types (FMDirectoryView *view,
(mime_type);
guessed_default_app = gnome_vfs_mime_get_default_application
(guessed_mime_type);
- if (default_app->id == NULL ||
+ if (default_app == NULL ||
+ default_app->id == NULL ||
+ guessed_default_app == NULL ||
guessed_default_app->id == NULL ||
strcmp (default_app->id, guessed_default_app->id) != 0) {
warn_mismatched_mime_types (view, file);