summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2016-03-12 18:52:31 +0100
committerBastien Nocera <hadess@hadess.net>2016-03-19 13:30:11 +0100
commit069cbacecada6959dfbb18194f7720c7be3022ab (patch)
tree4aeb5a55c8ff5eb07d10245d3bddc971901d596d
parentb8ad223b1e2fbe0aec24baeec224a76d91f4ca2f (diff)
downloadgvfs-069cbacecada6959dfbb18194f7720c7be3022ab.tar.gz
afc: Don't list inaccessible applications
As we can only start HouseArrest for applications that have UIFileSharingEnabled turned on, there's absolutely no need to list the other applications. See https://github.com/libimobiledevice/libimobiledevice/issues/193 https://bugzilla.gnome.org/show_bug.cgi?id=763606
-rw-r--r--daemon/gvfsbackendafc.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
index 0caa4fcc..b499fc00 100644
--- a/daemon/gvfsbackendafc.c
+++ b/daemon/gvfsbackendafc.c
@@ -57,7 +57,6 @@ typedef struct {
char *display_name;
char *id;
char *icon_path;
- gboolean hidden;
house_arrest_client_t house_arrest;
afc_client_t afc_cli;
} AppInfo;
@@ -1623,10 +1622,6 @@ g_vfs_backend_afc_set_info_from_app (GVfsBackendAfc *self,
g_file_info_set_symbolic_icon (info, symbolic_icon);
g_object_unref (symbolic_icon);
- /* hidden ? */
- if (app_info && app_info->hidden)
- g_file_info_set_is_hidden (info, TRUE);
-
/* name */
if (app_info != NULL)
{
@@ -1753,24 +1748,18 @@ g_vfs_backend_load_apps (GVfsBackendAfc *self)
{
plist_t app;
plist_t p_appid;
- plist_t p_doctypes;
plist_t p_name;
plist_t p_sharing;
char *s_appid;
char *s_name;
guint8 b_sharing;
- gboolean hidden;
AppInfo *info;
app = plist_array_get_item(apps, i);
p_appid = plist_dict_get_item (app, "CFBundleIdentifier");
p_name = plist_dict_get_item (app, "CFBundleDisplayName");
- p_doctypes = plist_dict_get_item (app, "CFBundleDocumentTypes");
- if (plist_array_get_size (p_doctypes) == 0)
- p_doctypes = NULL;
p_sharing = plist_dict_get_item (app, "UIFileSharingEnabled");
b_sharing = FALSE;
- hidden = FALSE;
if (p_sharing)
{
if (plist_get_node_type (p_sharing) == PLIST_BOOLEAN)
@@ -1792,9 +1781,7 @@ g_vfs_backend_load_apps (GVfsBackendAfc *self)
}
/* Doesn't support documents, or missing metadata? */
- if (p_doctypes == NULL && !b_sharing)
- hidden = TRUE;
- if (p_appid == NULL || p_name == NULL)
+ if (!b_sharing || p_appid == NULL || p_name == NULL)
{
continue;
}
@@ -1815,7 +1802,6 @@ g_vfs_backend_load_apps (GVfsBackendAfc *self)
info = g_new0 (AppInfo, 1);
info->display_name = s_name;
info->id = s_appid;
- info->hidden = hidden;
info->icon_path = g_vfs_backend_load_icon (self->sbs, info->id);