mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-03 04:21:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

common/dir: Add reply_type parameter to system helper dbus calls

Browse Source 
Make flatpak_dir_system_helper_call capable of dealing with a GUnixFDList
parameter and subsequently call g_dbus_connection_call_with_unix_fd_list_sync
for those methods.

Closes: #2657
Approved by: alexlarsson
This commit is contained in:
Umang Jain
2019-02-11 14:59:11 +05:30
committed by Atomic Bot
parent 80249b5f4d
commit e544c40f5b
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/flatpak-dir.c
View File

@@ -1173,11 +1173,12 @@ flatpak_dir_use_system_helper (FlatpakDir *self,
}
static GVariant *
flatpak_dir_system_helper_call (FlatpakDir *self,
const gchar *method_name,
GVariant *parameters,
GCancellable *cancellable,
GError **error)
flatpak_dir_system_helper_call (FlatpakDir *self,
const gchar *method_name,
GVariant *parameters,
const GVariantType *reply_type,
GCancellable *cancellable,
GError **error)
{
GVariant *res;
@@ -1207,7 +1208,8 @@ flatpak_dir_system_helper_call (FlatpakDir *self,
"org.freedesktop.Flatpak.SystemHelper",
method_name,
parameters,
NULL, G_DBUS_CALL_FLAGS_NONE, G_MAXINT,
reply_type,
G_DBUS_CALL_FLAGS_NONE, G_MAXINT,
cancellable,
error);
if (res == NULL && error)
@@ -1239,6 +1241,7 @@ flatpak_dir_system_helper_call_deploy (FlatpakDir *self,
arg_origin,
arg_subpaths,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}
@@ -1264,6 +1267,7 @@ flatpak_dir_system_helper_call_deploy_appstream (FlatpakDir *self,
arg_origin,
arg_arch,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}
@@ -1285,6 +1289,7 @@ flatpak_dir_system_helper_call_uninstall (FlatpakDir *self,
arg_flags,
arg_ref,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}
@@ -1309,6 +1314,7 @@ flatpak_dir_system_helper_call_install_bundle (FlatpakDir *self,
arg_flags,
arg_remote,
arg_installation),
G_VARIANT_TYPE ("(s)"),
cancellable, error);
if (ret == NULL)
return FALSE;
@@ -1338,6 +1344,7 @@ flatpak_dir_system_helper_call_configure_remote (FlatpakDir *self,
arg_config,
arg_gpg_key,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable,
error);
return ret != NULL;
@@ -1362,6 +1369,7 @@ flatpak_dir_system_helper_call_configure (FlatpakDir *self,
arg_key,
arg_value,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}
@@ -1387,6 +1395,7 @@ flatpak_dir_system_helper_call_update_remote (FlatpakDir *self,
arg_installation,
arg_summary_path,
arg_summary_sig_path),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}
@@ -1410,6 +1419,7 @@ flatpak_dir_system_helper_call_remove_local_ref (FlatpakDir *self,
arg_remote,
arg_ref,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}
@@ -1429,6 +1439,7 @@ flatpak_dir_system_helper_call_prune_local_repo (FlatpakDir *self,
g_variant_new ("(us)",
arg_flags,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}
@@ -1448,6 +1459,7 @@ flatpak_dir_system_helper_call_run_triggers (FlatpakDir *self,
g_variant_new ("(us)",
arg_flags,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}
@@ -1467,6 +1479,7 @@ flatpak_dir_system_helper_call_ensure_repo (FlatpakDir *self,
g_variant_new ("(us)",
arg_flags,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}
@@ -1486,6 +1499,7 @@ flatpak_dir_system_helper_call_update_summary (FlatpakDir *self,
g_variant_new ("(us)",
arg_flags,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}
@@ -1507,6 +1521,7 @@ flatpak_dir_system_helper_call_generate_oci_summary (FlatpakDir *self,
arg_flags,
arg_origin,
arg_installation),
G_VARIANT_TYPE ("()"),
cancellable, error);
return ret != NULL;
}