diff -u gvfs-1.4.0/debian/changelog gvfs-1.4.0/debian/changelog
--- gvfs-1.4.0/debian/changelog
+++ gvfs-1.4.0/debian/changelog
@@ -1,3 +1,12 @@
+gvfs (1.4.0-0ubuntu4) karmic; urgency=low
+
+  * Add 02_music-player-mimetype.patch: Add media player content type if we
+    have a multimedia-player icon. This is a kludge until
+    https://bugs.freedesktop.org/show_bug.cgi?id=24500 gets discussed/solved
+    properly. (LP: #440290)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 14 Oct 2009 11:57:35 +0200
+
 gvfs (1.4.0-0ubuntu3) karmic; urgency=low
 
   * Add 01_mtp_content_types.patch: Set correct MIME type for MTP music
diff -u gvfs-1.4.0/debian/patches/series gvfs-1.4.0/debian/patches/series
--- gvfs-1.4.0/debian/patches/series
+++ gvfs-1.4.0/debian/patches/series
@@ -1,3 +1,4 @@
 01_mtp_content_types.patch
+02_music-player-mimetype.patch
 00git-separate-eject-detach.patch
 99_ltmain_as-needed.patch
only in patch2:
unchanged:
--- gvfs-1.4.0.orig/debian/patches/02_music-player-mimetype.patch
+++ gvfs-1.4.0/debian/patches/02_music-player-mimetype.patch
@@ -0,0 +1,24 @@
+# Description: Add media player content type if we have a multimedia-player icon. This is a kludge until https://bugs.freedesktop.org/show_bug.cgi?id=24500 gets discussed/solved properly.
+# Ubuntu: https://launchpad.net/bugs/440290
+
+Index: gvfs-1.4.0/monitor/gdu/ggdumount.c
+===================================================================
+--- gvfs-1.4.0.orig/monitor/gdu/ggdumount.c	2009-10-14 11:31:29.000000000 +0200
++++ gvfs-1.4.0/monitor/gdu/ggdumount.c	2009-10-14 11:31:35.000000000 +0200
+@@ -1323,6 +1323,16 @@
+         }
+     }
+ 
++  /* also add media player if we have the multimedia-player icon (or a variant
++   * like multimedia-player-ipod-white); basing this on the icon is a kludge,
++   * better solution is being discussed in FD#24500 */
++  if (device != NULL)
++    {
++      const char* icon = gdu_device_get_presentation_icon_name (device);
++      if (icon != NULL && g_str_has_prefix (icon, "multimedia-player"))
++	  g_ptr_array_add (p, g_strdup ("x-content/audio-player"));
++    }
++
+   if (p->len == 0)
+     {
+       result = NULL;