[gnome-software/wip/temp/ubuntu-xenial-rebased: 322/326] UPDATE -> OFFLINE_UPDATE - changed enum values between master and 3-20
- From: Iain Lane <iainl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/temp/ubuntu-xenial-rebased: 322/326] UPDATE -> OFFLINE_UPDATE - changed enum values between master and 3-20
- Date: Fri, 29 Apr 2016 10:14:26 +0000 (UTC)
commit e5d46195db23c9a206e391741c51bdb865d46bf9
Author: Iain Lane <iain orangesquash org uk>
Date: Fri Apr 29 09:33:23 2016 +0100
UPDATE -> OFFLINE_UPDATE - changed enum values between master and 3-20
src/gs-application.c | 4 ++--
src/gs-shell-updates.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/gs-application.c b/src/gs-application.c
index 8d7381e..d827443 100644
--- a/src/gs-application.c
+++ b/src/gs-application.c
@@ -508,7 +508,7 @@ reboot_failed_cb (GObject *source, GAsyncResult *res, gpointer user_data)
/* cancel trigger */
gs_plugin_loader_app_action_async (app->plugin_loader,
NULL, /* everything! */
- GS_PLUGIN_LOADER_ACTION_UPDATE_CANCEL,
+ GS_PLUGIN_LOADER_ACTION_OFFLINE_UPDATE_CANCEL,
app->cancellable,
cancel_trigger_failed_cb,
app);
@@ -524,7 +524,7 @@ offline_update_cb (GsPluginLoader *plugin_loader,
{
g_autoptr(GDBusConnection) bus = NULL;
g_autoptr(GError) error = NULL;
- if (!gs_plugin_loader_update_finish (plugin_loader, res, &error)) {
+ if (!gs_plugin_loader_offline_update_finish (plugin_loader, res, &error)) {
g_warning ("Failed to trigger offline update: %s", error->message);
return;
}
diff --git a/src/gs-shell-updates.c b/src/gs-shell-updates.c
index beb8d43..69470a3 100644
--- a/src/gs-shell-updates.c
+++ b/src/gs-shell-updates.c
@@ -954,7 +954,7 @@ gs_shell_updates_reboot_failed_cb (GObject *source, GAsyncResult *res, gpointer
apps = gs_update_list_get_apps (GS_UPDATE_LIST (self->list_box_updates));
gs_plugin_loader_app_action_async (self->plugin_loader,
GS_APP (apps->data),
- GS_PLUGIN_LOADER_ACTION_UPDATE_CANCEL,
+ GS_PLUGIN_LOADER_ACTION_OFFLINE_UPDATE_CANCEL,
self->cancellable,
cancel_trigger_failed_cb,
self);
@@ -1133,7 +1133,7 @@ upgrade_reboot_failed_cb (GObject *source,
apps = gs_update_list_get_apps (GS_UPDATE_LIST (self->list_box_updates));
gs_plugin_loader_app_action_async (self->plugin_loader,
GS_APP (apps->data),
- GS_PLUGIN_LOADER_ACTION_UPDATE_CANCEL,
+ GS_PLUGIN_LOADER_ACTION_OFFLINE_UPDATE_CANCEL,
self->cancellable,
cancel_trigger_failed_cb,
self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]