[gnome-software/wip/kalev/flatpak-enable-remote: 1/2] flatpak: trivial: Break out a function
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/kalev/flatpak-enable-remote: 1/2] flatpak: trivial: Break out a function
- Date: Wed, 18 Sep 2019 12:04:50 +0000 (UTC)
commit afb145d24518ff3fb9defd91d142beb26a5fa447
Author: Kalev Lember <klember redhat com>
Date: Wed Sep 18 13:53:59 2019 +0200
flatpak: trivial: Break out a function
plugins/flatpak/gs-flatpak.c | 47 ++++++++++++++++++++++++++++----------------
1 file changed, 30 insertions(+), 17 deletions(-)
---
diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c
index a8fb5f59..58c772cf 100644
--- a/plugins/flatpak/gs-flatpak.c
+++ b/plugins/flatpak/gs-flatpak.c
@@ -1221,28 +1221,16 @@ gs_flatpak_ref_to_app (GsFlatpak *self, const gchar *ref,
return NULL;
}
-gboolean
-gs_flatpak_app_install_source (GsFlatpak *self, GsApp *app,
- GCancellable *cancellable,
- GError **error)
+static FlatpakRemote *
+gs_flatpak_create_new_remote (GsFlatpak *self,
+ GsApp *app,
+ GCancellable *cancellable,
+ GError **error)
{
const gchar *gpg_key;
const gchar *branch;
g_autoptr(FlatpakRemote) xremote = NULL;
- /* does the remote already exist and is disabled */
- xremote = flatpak_installation_get_remote_by_name (self->installation,
- gs_app_get_id (app),
- cancellable, NULL);
- if (xremote != NULL) {
- g_set_error (error,
- GS_PLUGIN_ERROR,
- GS_PLUGIN_ERROR_FAILED,
- "flatpak source %s already exists",
- flatpak_remote_get_name (xremote));
- return FALSE;
- }
-
/* create a new remote */
xremote = flatpak_remote_new (gs_app_get_id (app));
flatpak_remote_set_url (xremote, gs_flatpak_app_get_repo_url (app));
@@ -1269,6 +1257,31 @@ gs_flatpak_app_install_source (GsFlatpak *self, GsApp *app,
if (branch != NULL)
flatpak_remote_set_default_branch (xremote, branch);
+ return g_steal_pointer (&xremote);
+}
+
+gboolean
+gs_flatpak_app_install_source (GsFlatpak *self, GsApp *app,
+ GCancellable *cancellable,
+ GError **error)
+{
+ g_autoptr(FlatpakRemote) xremote = NULL;
+
+ /* does the remote already exist and is disabled */
+ xremote = flatpak_installation_get_remote_by_name (self->installation,
+ gs_app_get_id (app),
+ cancellable, NULL);
+ if (xremote != NULL) {
+ g_set_error (error,
+ GS_PLUGIN_ERROR,
+ GS_PLUGIN_ERROR_FAILED,
+ "flatpak source %s already exists",
+ flatpak_remote_get_name (xremote));
+ return FALSE;
+ }
+
+ xremote = gs_flatpak_create_new_remote (self, app, cancellable, error);
+
/* install it */
gs_app_set_state (app, AS_APP_STATE_INSTALLING);
if (!flatpak_installation_modify_remote (self->installation,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]