[gnome-builder/wip/chergert/pipeline-merge] flatpak GbpFlatpakTransfer does not need IdeObject

[Christian Hergert <chergert src gnome org>]

commit d32f5eb989394102cc33f3a5e3752a4bd9020758
Author: Christian Hergert <chergert redhat com>
Date:   Sat Feb 11 01:56:09 2017 -0800

    flatpak GbpFlatpakTransfer does not need IdeObject
    
    This can just be a GObject, so no need to inherit from IdeObject.

 plugins/flatpak/gbp-flatpak-runtime-provider.c |    2 +-
 plugins/flatpak/gbp-flatpak-transfer.c         |    7 ++-----
 plugins/flatpak/gbp-flatpak-transfer.h         |    5 ++---
 3 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-runtime-provider.c b/plugins/flatpak/gbp-flatpak-runtime-provider.c
index e65eca6..28fd77a 100644
--- a/plugins/flatpak/gbp-flatpak-runtime-provider.c
+++ b/plugins/flatpak/gbp-flatpak-runtime-provider.c
@@ -499,7 +499,7 @@ gbp_flatpak_runtime_provider_install_async (IdeRuntimeProvider  *provider,
     IDE_GOTO (unknown_runtime_id);
 
   context = ide_object_get_context (IDE_OBJECT (self->manager));
-  transfer = gbp_flatpak_transfer_new (context, parts[1], parts[2], parts[3], TRUE);
+  transfer = gbp_flatpak_transfer_new (parts[1], parts[2], parts[3], TRUE);
 
   transfer_manager = ide_context_get_transfer_manager (context);
   ide_transfer_manager_execute_async (transfer_manager,
diff --git a/plugins/flatpak/gbp-flatpak-transfer.c b/plugins/flatpak/gbp-flatpak-transfer.c
index 63a4c2d..00d7c87 100644
--- a/plugins/flatpak/gbp-flatpak-transfer.c
+++ b/plugins/flatpak/gbp-flatpak-transfer.c
@@ -60,7 +60,7 @@ typedef struct
 static void transfer_iface_init                     (IdeTransferInterface *iface);
 static void gbp_flatpak_transfer_install_repos_tick (GTask                *task);
 
-G_DEFINE_TYPE_WITH_CODE (GbpFlatpakTransfer, gbp_flatpak_transfer, IDE_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (GbpFlatpakTransfer, gbp_flatpak_transfer, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (IDE_TYPE_TRANSFER, transfer_iface_init))
 
 static GParamSpec *properties [N_PROPS];
@@ -682,13 +682,11 @@ gbp_flatpak_transfer_init (GbpFlatpakTransfer *self)
 }
 
 GbpFlatpakTransfer *
-gbp_flatpak_transfer_new (IdeContext  *context,
-                          const gchar *id,
+gbp_flatpak_transfer_new (const gchar *id,
                           const gchar *arch,
                           const gchar *branch,
                           gboolean     force_update)
 {
-  g_return_val_if_fail (IDE_IS_CONTEXT (context), NULL);
   g_return_val_if_fail (id != NULL, NULL);
 
   if (arch == NULL)
@@ -698,7 +696,6 @@ gbp_flatpak_transfer_new (IdeContext  *context,
     branch = "stable";
 
   return g_object_new (GBP_TYPE_FLATPAK_TRANSFER,
-                       "context", context,
                        "id", id,
                        "arch", arch,
                        "branch", branch,
diff --git a/plugins/flatpak/gbp-flatpak-transfer.h b/plugins/flatpak/gbp-flatpak-transfer.h
index f7d4847..9dff357 100644
--- a/plugins/flatpak/gbp-flatpak-transfer.h
+++ b/plugins/flatpak/gbp-flatpak-transfer.h
@@ -25,10 +25,9 @@ G_BEGIN_DECLS
 
 #define GBP_TYPE_FLATPAK_TRANSFER (gbp_flatpak_transfer_get_type())
 
-G_DECLARE_FINAL_TYPE (GbpFlatpakTransfer, gbp_flatpak_transfer, GBP, FLATPAK_TRANSFER, IdeObject)
+G_DECLARE_FINAL_TYPE (GbpFlatpakTransfer, gbp_flatpak_transfer, GBP, FLATPAK_TRANSFER, GObject)
 
-GbpFlatpakTransfer *gbp_flatpak_transfer_new          (IdeContext         *context,
-                                                       const gchar        *id,
+GbpFlatpakTransfer *gbp_flatpak_transfer_new          (const gchar        *id,
                                                        const gchar        *arch,
                                                        const gchar        *branch,
                                                        gboolean            force_update);