diff options
author | Alexander Larsson <alexl@redhat.com> | 2016-04-27 13:01:54 +0200 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2016-04-27 13:01:54 +0200 |
commit | 4b0621cfb0c714b3935068b25cf4b441bfe7165b (patch) | |
tree | 7f43a2dc40a5b2c8963a0aba4c2d252c11c69154 /app | |
parent | 5789c5c99d3ffeadb9c7ee69e80145fdcb199e53 (diff) | |
download | xdg-app-4b0621cfb0c714b3935068b25cf4b441bfe7165b.tar.gz |
info: Use deploy_data
Diffstat (limited to 'app')
-rw-r--r-- | app/xdg-app-builtins-info.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/xdg-app-builtins-info.c b/app/xdg-app-builtins-info.c index c44378b..954ef6d 100644 --- a/app/xdg-app-builtins-info.c +++ b/app/xdg-app-builtins-info.c @@ -61,10 +61,11 @@ xdg_app_builtin_info (int argc, char **argv, GCancellable *cancellable, GError * g_autoptr(XdgAppDir) system_dir = NULL; XdgAppDir *dir = NULL; g_autoptr(GError) lookup_error = NULL; + g_autoptr(GVariant) deploy_data = NULL; const char *name; const char *branch = "master"; - g_autofree char *commit = NULL; - g_autofree char *origin = NULL; + const char *commit = NULL; + const char *origin = NULL; gboolean is_app = FALSE; gboolean first = TRUE; @@ -120,11 +121,12 @@ xdg_app_builtin_info (int argc, char **argv, GCancellable *cancellable, GError * return FALSE; } - commit = xdg_app_dir_read_active (dir, ref, NULL); - if (commit == NULL) + deploy_data = xdg_app_dir_get_deploy_data (dir, ref, cancellable, error); + if (deploy_data == NULL) return FALSE; - origin = xdg_app_dir_get_origin (dir, ref, NULL, NULL); + commit = xdg_app_deploy_data_get_commit (deploy_data); + origin = xdg_app_deploy_data_get_origin (deploy_data); if (!opt_show_ref && !opt_show_origin && !opt_show_commit) opt_show_ref = opt_show_origin = opt_show_commit = TRUE; |