[Goodies-commits] r4057 - in thunar-volman/trunk: . thunar-volman

[Benedikt Meurer]

Author: benny
Date: 2008-03-15 09:33:34 +0000 (Sat, 15 Mar 2008)
New Revision: 4057

Modified:
   thunar-volman/trunk/ChangeLog
   thunar-volman/trunk/thunar-volman/tvm-block-device.c
Log:
2008-03-15	Benedikt Meurer <benny at xfce.org>

	* thunar-volman/tvm-block-device.c: Apply patch from Tino Keitel
	  and Colin Leroy to fix USB flash drives being incorrectly
	  recognized as audio players. Bug #2856.




Modified: thunar-volman/trunk/ChangeLog
===================================================================
--- thunar-volman/trunk/ChangeLog	2008-03-14 19:34:41 UTC (rev 4056)
+++ thunar-volman/trunk/ChangeLog	2008-03-15 09:33:34 UTC (rev 4057)
@@ -1,3 +1,9 @@
+2008-03-15	Benedikt Meurer <benny at xfce.org>
+
+	* thunar-volman/tvm-block-device.c: Apply patch from Tino Keitel
+	  and Colin Leroy to fix USB flash drives being incorrectly
+	  recognized as audio players. Bug #2856.
+
 2007-12-02	Benedikt Meurer <benny at xfce.org>
 
 	* configure.in.in: Post-release version bump.

Modified: thunar-volman/trunk/thunar-volman/tvm-block-device.c
===================================================================
--- thunar-volman/trunk/thunar-volman/tvm-block-device.c	2008-03-14 19:34:41 UTC (rev 4056)
+++ thunar-volman/trunk/thunar-volman/tvm-block-device.c	2008-03-15 09:33:34 UTC (rev 4057)
@@ -131,12 +131,13 @@
 {
   gboolean result = FALSE;
   gboolean autoipod;
+  gboolean is_audio_player = FALSE;
   gchar   *autoipod_command;
   gchar   *autophoto_command;
   gchar   *storage_udi;
   gchar   *path_dcim = NULL;
   gchar   *product;
-  gint     response;
+  gint     response = TVM_RESPONSE_NONE;
 
   /* check if music players should be handled automatically */
   g_object_get (G_OBJECT (preferences), "autoipod", &autoipod, "autoipod-command", &autoipod_command, NULL);
@@ -149,6 +150,7 @@
           /* check if we have a portable audio player here */
           if (libhal_device_query_capability (context, storage_udi, "portable_audio_player", NULL))
             {
+	      is_audio_player = TRUE;
               /* check if we have an iPod here */
               product = libhal_device_get_property_string (context, storage_udi, "info.product", NULL);
               if (product != NULL && strcmp (product, "iPod") != 0)
@@ -194,7 +196,8 @@
           else
             {
               /* no photos, so we can manage only music */
-              response = TVM_RESPONSE_MUSIC;
+              if(is_audio_player)
+		      response = TVM_RESPONSE_MUSIC;
             }
 
           /* check what to do */