|
 |
769c0b |
From 8ef97f789e132868423e920c06286707beadc6de Mon Sep 17 00:00:00 2001
|
|
|
769c0b |
From: Philip Langdale <philipl@overt.org>
|
|
|
769c0b |
Date: Sat, 30 Nov 2013 18:12:05 +0000
|
|
|
769c0b |
Subject: MTP: Fix compilation warning.
|
|
|
769c0b |
|
|
|
769c0b |
https://bugzilla.gnome.org/show_bug.cgi?id=715119
|
|
|
769c0b |
---
|
|
|
769c0b |
diff --git a/daemon/gvfsbackendmtp.c b/daemon/gvfsbackendmtp.c
|
|
|
769c0b |
index 02059eb..12dba6c 100644
|
|
|
769c0b |
--- a/daemon/gvfsbackendmtp.c
|
|
|
769c0b |
+++ b/daemon/gvfsbackendmtp.c
|
|
|
769c0b |
@@ -1003,14 +1003,14 @@ do_query_info (GVfsBackend *backend,
|
|
|
769c0b |
DEBUG ("(I) do_query_info (filename = %s) ", filename);
|
|
|
769c0b |
g_mutex_lock (&G_VFS_BACKEND_MTP (backend)->mutex);
|
|
|
769c0b |
|
|
|
769c0b |
- FAIL_DURING_UNMOUNT();
|
|
|
769c0b |
-
|
|
|
769c0b |
gchar **elements = g_strsplit_set (filename, "/", -1);
|
|
|
769c0b |
unsigned int ne = g_strv_length (elements);
|
|
|
769c0b |
|
|
|
769c0b |
LIBMTP_mtpdevice_t *device;
|
|
|
769c0b |
device = G_VFS_BACKEND_MTP (backend)->device;
|
|
|
769c0b |
|
|
|
769c0b |
+ FAIL_DURING_UNMOUNT();
|
|
|
769c0b |
+
|
|
|
769c0b |
if (ne == 2 && elements[1][0] == '\0') {
|
|
|
769c0b |
get_device_info (G_VFS_BACKEND_MTP (backend), info);
|
|
|
769c0b |
} else if (ne < 3) {
|
|
|
769c0b |
@@ -1425,11 +1425,11 @@ do_set_display_name (GVfsBackend *backend,
|
|
|
769c0b |
DEBUG ("(I) do_set_display_name '%s' --> '%s' ", filename, display_name);
|
|
|
769c0b |
g_mutex_lock (&G_VFS_BACKEND_MTP (backend)->mutex);
|
|
|
769c0b |
|
|
|
769c0b |
- FAIL_DURING_UNMOUNT();
|
|
|
769c0b |
-
|
|
|
769c0b |
gchar **elements = g_strsplit_set (filename, "/", -1);
|
|
|
769c0b |
unsigned int ne = g_strv_length (elements);
|
|
|
769c0b |
|
|
|
769c0b |
+ FAIL_DURING_UNMOUNT();
|
|
|
769c0b |
+
|
|
|
769c0b |
if (ne < 3) {
|
|
|
769c0b |
g_vfs_job_failed_literal (G_VFS_JOB (job),
|
|
|
769c0b |
G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
|
|
|
769c0b |
--
|
|
|
769c0b |
cgit v0.9.2
|