diff options
| author | Benedikt Meurer <benny@xfce.org> | 2008-03-15 09:33:34 +0000 |
|---|---|---|
| committer | Benedikt Meurer <benny@xfce.org> | 2008-03-15 09:33:34 +0000 |
| commit | f001aa2b78f17a130f79f9656aa9c5e8692362d5 (patch) | |
| tree | 166ab4d5290e097db3d55df9c09543739b2722e4 /thunar-volman | |
| parent | 8ce1c70db5279d19cf7626bbbc4277e984f68e63 (diff) | |
| download | thunar-volman-f001aa2b78f17a130f79f9656aa9c5e8692362d5.tar.gz | |
2008-03-15 Benedikt Meurer <benny@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.
(Old svn revision: 4057)
Diffstat (limited to 'thunar-volman')
| -rw-r--r-- | thunar-volman/tvm-block-device.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c index 4ece845..a662bd5 100644 --- a/thunar-volman/tvm-block-device.c +++ b/thunar-volman/tvm-block-device.c @@ -131,12 +131,13 @@ tvm_block_device_autoipod (TvmPreferences *preferences, { 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 @@ tvm_block_device_autoipod (TvmPreferences *preferences, /* 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 @@ tvm_block_device_autoipod (TvmPreferences *preferences, 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 */ |