summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2003-12-16 09:38:09 +0000
committerAlexander Larsson <alexl@src.gnome.org>2003-12-16 09:38:09 +0000
commitf48f95c9b656a44fd77feb7088e7b4084ef0f2c4 (patch)
tree312ceb806a772a2a386e6dbba389c74660a7f1fe
parent2f00c8c90ec3d6ab8426d0e58ad40206965402df (diff)
downloadnautilus-f48f95c9b656a44fd77feb7088e7b4084ef0f2c4.tar.gz
Check for new ogg mime-type. Patch from Mattias Eriksson
2003-12-16 Alexander Larsson <alexl@redhat.com> * src/file-manager/fm-icon-view.c (play_file): Check for new ogg mime-type. Patch from Mattias Eriksson <mattias.eriksson@simovits.com>
-rw-r--r--ChangeLog6
-rw-r--r--src/file-manager/fm-icon-view.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a5d1920bc..6ab1e9334 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-16 Alexander Larsson <alexl@redhat.com>
+
+ * src/file-manager/fm-icon-view.c (play_file):
+ Check for new ogg mime-type.
+ Patch from Mattias Eriksson <mattias.eriksson@simovits.com>
+
2003-12-15 Dennis Cranston <dennis_cranston at yahoo com>
* src/file-manager/fm-directory-view.c: Do not add trash and
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index e0f164de3..f5d4bdf6a 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -1771,8 +1771,9 @@ play_file (gpointer callback_data)
file_uri = nautilus_file_get_uri (file);
mime_type = nautilus_file_get_mime_type (file);
is_mp3 = eel_strcasecmp (mime_type, "audio/mpeg") == 0;
- is_ogg = eel_strcasecmp (mime_type, "application/x-ogg") == 0;
-
+ is_ogg = eel_strcasecmp (mime_type, "application/x-ogg") == 0 ||
+ eel_strcasecmp (mime_type, "application/ogg") == 0;
+
mp3_pid = fork ();
if (mp3_pid == (pid_t) 0) {
/* Set the group (session) id to this process for future killing. */