[gnome-software/wip/kalev/more-distro-upgrades: 9/9] Move upgrade download from packagekit-refine plugin to packagekit plugin



commit c6c9b8a9464b8784479a6c33721a3019a7485912
Author: Kalev Lember <klember redhat com>
Date:   Mon Feb 15 16:53:04 2016 +0100

    Move upgrade download from packagekit-refine plugin to packagekit plugin
    
    This lets us pass down progress callbacks more easily.

 src/plugins/gs-plugin-packagekit-refine.c |   38 -----------------------------
 src/plugins/gs-plugin-packagekit.c        |   38 +++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c
index d14d277..903f610 100644
--- a/src/plugins/gs-plugin-packagekit-refine.c
+++ b/src/plugins/gs-plugin-packagekit-refine.c
@@ -753,44 +753,6 @@ gs_plugin_refine_requires_package_id (GsApp *app, GsPluginRefineFlags flags)
 }
 
 /**
- * gs_plugin_app_upgrade_download:
- */
-gboolean
-gs_plugin_app_upgrade_download (GsPlugin *plugin,
-                               GsApp *app,
-                               GCancellable *cancellable,
-                               GError **error)
-{
-       ProgressData data;
-       g_autoptr(PkResults) results = NULL;
-
-       data.plugin = plugin;
-       data.ptask = NULL;
-       data.profile_id = NULL;
-
-       /* check is distro-upgrade */
-       if (gs_app_get_kind (app) != GS_APP_KIND_DISTRO_UPGRADE) {
-               g_set_error (error,
-                            GS_PLUGIN_ERROR,
-                            GS_PLUGIN_ERROR_FAILED,
-                            "app %s is not a distro upgrade",
-                            gs_app_get_id (app));
-               return FALSE;
-       }
-
-       /* ask PK to download enough packages to upgrade the system */
-       gs_app_set_state (app, AS_APP_STATE_INSTALLING);
-       results = pk_client_upgrade_system (plugin->priv->client,
-                                           pk_bitfield_from_enums (PK_TRANSACTION_FLAG_ENUM_ONLY_DOWNLOAD, 
-1),
-                                           gs_app_get_version (app),
-                                           PK_UPGRADE_KIND_ENUM_COMPLETE,
-                                           cancellable,
-                                           gs_plugin_packagekit_progress_cb, &data,
-                                           error);
-       return results != NULL;
-}
-
-/**
  * gs_plugin_packagekit_refine_distro_upgrade:
  **/
 static gboolean
diff --git a/src/plugins/gs-plugin-packagekit.c b/src/plugins/gs-plugin-packagekit.c
index 0210db3..c3bfb8e 100644
--- a/src/plugins/gs-plugin-packagekit.c
+++ b/src/plugins/gs-plugin-packagekit.c
@@ -631,6 +631,44 @@ gs_plugin_app_remove (GsPlugin *plugin,
 }
 
 /**
+ * gs_plugin_app_upgrade_download:
+ */
+gboolean
+gs_plugin_app_upgrade_download (GsPlugin *plugin,
+                               GsApp *app,
+                               GCancellable *cancellable,
+                               GError **error)
+{
+       ProgressData data;
+       g_autoptr(PkResults) results = NULL;
+
+       data.app = app;
+       data.plugin = plugin;
+       data.ptask = NULL;
+
+       /* check is distro-upgrade */
+       if (gs_app_get_kind (app) != GS_APP_KIND_DISTRO_UPGRADE) {
+               g_set_error (error,
+                            GS_PLUGIN_ERROR,
+                            GS_PLUGIN_ERROR_FAILED,
+                            "app %s is not a distro upgrade",
+                            gs_app_get_id (app));
+               return FALSE;
+       }
+
+       /* ask PK to download enough packages to upgrade the system */
+       gs_app_set_state (app, AS_APP_STATE_INSTALLING);
+       results = pk_client_upgrade_system (PK_CLIENT (plugin->priv->task),
+                                           pk_bitfield_from_enums (PK_TRANSACTION_FLAG_ENUM_ONLY_DOWNLOAD, 
-1),
+                                           gs_app_get_version (app),
+                                           PK_UPGRADE_KIND_ENUM_COMPLETE,
+                                           cancellable,
+                                           gs_plugin_packagekit_progress_cb, &data,
+                                           error);
+       return results != NULL;
+}
+
+/**
  * gs_plugin_add_search_files:
  */
 gboolean


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]