[gnome-software] Use AsAppState from libappstream-glib
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Use AsAppState from libappstream-glib
- Date: Tue, 1 Jul 2014 17:09:43 +0000 (UTC)
commit d09261dba167b7e4e91727840f472f4cd4d8a1d9
Author: Richard Hughes <richard hughsie com>
Date: Tue Jul 1 18:02:16 2014 +0100
Use AsAppState from libappstream-glib
src/gs-app-addon-row.c | 24 +++---
src/gs-app-row.c | 20 ++--
src/gs-app-tile.c | 12 +-
src/gs-app.c | 137 +++++++++++-----------------
src/gs-app.h | 18 +---
src/gs-feature-tile.c | 10 +-
src/gs-history-dialog.c | 10 +-
src/gs-plugin-loader.c | 50 +++++-----
src/gs-plugin-loader.h | 2 +-
src/gs-popular-tile.c | 10 +-
src/gs-self-test.c | 4 +-
src/gs-shell-details.c | 108 +++++++++++-----------
src/gs-shell-installed.c | 8 +-
src/gs-shell-search-provider.c | 2 +-
src/gs-shell-search.c | 6 +-
src/plugins/gs-plugin-appstream.c | 4 +-
src/plugins/gs-plugin-dummy.c | 6 +-
src/plugins/gs-plugin-epiphany.c | 24 +++---
src/plugins/gs-plugin-packagekit-history.c | 10 +-
src/plugins/gs-plugin-packagekit-offline.c | 2 +-
src/plugins/gs-plugin-packagekit-refine.c | 24 +++---
src/plugins/gs-plugin-packagekit-refresh.c | 2 +-
src/plugins/gs-plugin-packagekit-updates.c | 2 +-
src/plugins/gs-plugin-packagekit.c | 18 ++--
src/plugins/gs-plugin-self-test.c | 4 +-
src/plugins/gs-plugin-systemd-updates.c | 2 +-
src/plugins/packagekit-common.c | 6 +-
27 files changed, 242 insertions(+), 283 deletions(-)
---
diff --git a/src/gs-app-addon-row.c b/src/gs-app-addon-row.c
index 8eb3bcb..00eefdd 100644
--- a/src/gs-app-addon-row.c
+++ b/src/gs-app-addon-row.c
@@ -93,20 +93,20 @@ gs_app_addon_row_refresh (GsAppAddonRow *row)
/* update the state label */
switch (gs_app_get_state (row->priv->app)) {
- case GS_APP_STATE_QUEUED:
+ case AS_APP_STATE_QUEUED_FOR_INSTALL:
gtk_widget_set_visible (priv->label, TRUE);
gtk_label_set_label (GTK_LABEL (priv->label), _("Pending"));
break;
- case GS_APP_STATE_UPDATABLE:
- case GS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_INSTALLED:
gtk_widget_set_visible (priv->label, TRUE);
gtk_label_set_label (GTK_LABEL (priv->label), _("Installed"));
break;
- case GS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_INSTALLING:
gtk_widget_set_visible (priv->label, TRUE);
gtk_label_set_label (GTK_LABEL (priv->label), _("Installing"));
break;
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_REMOVING:
gtk_widget_set_visible (priv->label, TRUE);
gtk_label_set_label (GTK_LABEL (priv->label), _("Removing"));
break;
@@ -117,25 +117,25 @@ gs_app_addon_row_refresh (GsAppAddonRow *row)
/* update the checkbox */
switch (gs_app_get_state (row->priv->app)) {
- case GS_APP_STATE_QUEUED:
+ case AS_APP_STATE_QUEUED_FOR_INSTALL:
gtk_widget_set_sensitive (priv->checkbox, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (row->priv->checkbox), TRUE);
break;
- case GS_APP_STATE_AVAILABLE:
- case GS_APP_STATE_LOCAL:
+ case AS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_AVAILABLE_LOCAL:
gtk_widget_set_sensitive (priv->checkbox, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (row->priv->checkbox), FALSE);
break;
- case GS_APP_STATE_UPDATABLE:
- case GS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_INSTALLED:
gtk_widget_set_sensitive (priv->checkbox, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (row->priv->checkbox), TRUE);
break;
- case GS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_INSTALLING:
gtk_widget_set_sensitive (priv->checkbox, FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (row->priv->checkbox), TRUE);
break;
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_REMOVING:
gtk_widget_set_sensitive (priv->checkbox, FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (row->priv->checkbox), FALSE);
break;
diff --git a/src/gs-app-row.c b/src/gs-app-row.c
index 900e457..f14b9e8 100644
--- a/src/gs-app-row.c
+++ b/src/gs-app-row.c
@@ -82,7 +82,7 @@ gs_app_row_get_description (GsAppRow *app_row)
/* convert the markdown update description into PangoMarkup */
if (priv->show_update &&
- gs_app_get_state (priv->app) == GS_APP_STATE_UPDATABLE) {
+ gs_app_get_state (priv->app) == AS_APP_STATE_UPDATABLE) {
tmp = gs_app_get_update_details (priv->app);
if (tmp != NULL && tmp[0] != '\0') {
markdown = gs_markdown_new (GS_MARKDOWN_OUTPUT_PANGO);
@@ -137,7 +137,7 @@ gs_app_row_refresh (GsAppRow *app_row)
gtk_label_set_label (GTK_LABEL (priv->name_label),
gs_app_get_name (priv->app));
if (priv->show_update &&
- gs_app_get_state (priv->app) == GS_APP_STATE_UPDATABLE) {
+ gs_app_get_state (priv->app) == AS_APP_STATE_UPDATABLE) {
gtk_widget_show (priv->version_label);
gtk_widget_hide (priv->star);
gtk_label_set_label (GTK_LABEL (priv->version_label),
@@ -183,13 +183,13 @@ gs_app_row_refresh (GsAppRow *app_row)
gtk_style_context_remove_class (context, "destructive-action");
switch (gs_app_get_state (app_row->priv->app)) {
- case GS_APP_STATE_UNAVAILABLE:
+ case AS_APP_STATE_UNAVAILABLE:
gtk_widget_set_visible (priv->button, TRUE);
/* TRANSLATORS: this is a button next to the search results that
* allows the application to be easily installed */
gtk_button_set_label (GTK_BUTTON (priv->button), _("Visit website"));
break;
- case GS_APP_STATE_QUEUED:
+ case AS_APP_STATE_QUEUED_FOR_INSTALL:
gtk_widget_set_visible (priv->label, TRUE);
gtk_widget_set_visible (priv->button, TRUE);
/* TRANSLATORS: this is a button next to the search results that
@@ -199,15 +199,15 @@ gs_app_row_refresh (GsAppRow *app_row)
* that has been queued for installation */
gtk_label_set_label (GTK_LABEL (priv->label), _("Pending"));
break;
- case GS_APP_STATE_AVAILABLE:
- case GS_APP_STATE_LOCAL:
+ case AS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_AVAILABLE_LOCAL:
gtk_widget_set_visible (priv->button, TRUE);
/* TRANSLATORS: this is a button next to the search results that
* allows the application to be easily installed */
gtk_button_set_label (GTK_BUTTON (priv->button), _("Install"));
break;
- case GS_APP_STATE_UPDATABLE:
- case GS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_INSTALLED:
if (gs_app_get_kind (app_row->priv->app) != GS_APP_KIND_SYSTEM &&
!app_row->priv->show_update)
gtk_widget_set_visible (priv->button, TRUE);
@@ -217,7 +217,7 @@ gs_app_row_refresh (GsAppRow *app_row)
if (priv->colorful)
gtk_style_context_add_class (context, "destructive-action");
break;
- case GS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_INSTALLING:
gtk_spinner_start (GTK_SPINNER (priv->spinner));
gtk_widget_set_visible (priv->spinner, TRUE);
gtk_widget_set_visible (priv->button, TRUE);
@@ -226,7 +226,7 @@ gs_app_row_refresh (GsAppRow *app_row)
* shows the status of an application being installed */
gtk_button_set_label (GTK_BUTTON (priv->button), _("Installing"));
break;
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_REMOVING:
gtk_spinner_start (GTK_SPINNER (priv->spinner));
gtk_widget_set_visible (priv->spinner, TRUE);
gtk_widget_set_visible (priv->button, TRUE);
diff --git a/src/gs-app-tile.c b/src/gs-app-tile.c
index a52afe5..e7d10dc 100644
--- a/src/gs-app-tile.c
+++ b/src/gs-app-tile.c
@@ -73,7 +73,7 @@ app_state_changed (GsApp *app, GParamSpec *pspec, GsAppTile *tile)
label = gtk_bin_get_child (GTK_BIN (priv->eventbox));
switch (gs_app_get_state (app)) {
- case GS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_INSTALLED:
installed = TRUE;
name = g_strdup_printf ("%s (%s)",
gs_app_get_name (app),
@@ -82,7 +82,7 @@ app_state_changed (GsApp *app, GParamSpec *pspec, GsAppTile *tile)
* that tells the user the application is installed */
gtk_label_set_label (GTK_LABEL (label), _("Installed"));
break;
- case GS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_INSTALLING:
installed = TRUE;
name = g_strdup_printf ("%s (%s)",
gs_app_get_name (app),
@@ -91,7 +91,7 @@ app_state_changed (GsApp *app, GParamSpec *pspec, GsAppTile *tile)
* that tells the user the application is being installing */
gtk_label_set_label (GTK_LABEL (label), _("Installing"));
break;
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_REMOVING:
installed = TRUE;
name = g_strdup_printf ("%s (%s)",
gs_app_get_name (app),
@@ -100,7 +100,7 @@ app_state_changed (GsApp *app, GParamSpec *pspec, GsAppTile *tile)
* that tells the user the application is being removed */
gtk_label_set_label (GTK_LABEL (label), _("Removing"));
break;
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_UPDATABLE:
installed = TRUE;
name = g_strdup_printf ("%s (%s)",
gs_app_get_name (app),
@@ -110,8 +110,8 @@ app_state_changed (GsApp *app, GParamSpec *pspec, GsAppTile *tile)
* application available */
gtk_label_set_label (GTK_LABEL (label), _("Updates"));
break;
- case GS_APP_STATE_QUEUED:
- case GS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_QUEUED_FOR_INSTALL:
+ case AS_APP_STATE_AVAILABLE:
default:
installed = FALSE;
name = g_strdup (gs_app_get_name (app));
diff --git a/src/gs-app.c b/src/gs-app.c
index eb36763..85b0882 100644
--- a/src/gs-app.c
+++ b/src/gs-app.c
@@ -85,7 +85,7 @@ struct GsAppPrivate
guint64 size;
GsAppKind kind;
AsIdKind id_kind;
- GsAppState state;
+ AsAppState state;
GHashTable *metadata;
GdkPixbuf *pixbuf;
GdkPixbuf *featured_pixbuf;
@@ -154,33 +154,6 @@ gs_app_kind_to_string (GsAppKind kind)
}
/**
- * gs_app_state_to_string:
- **/
-const gchar *
-gs_app_state_to_string (GsAppState state)
-{
- if (state == GS_APP_STATE_UNKNOWN)
- return "unknown";
- if (state == GS_APP_STATE_INSTALLED)
- return "installed";
- if (state == GS_APP_STATE_AVAILABLE)
- return "available";
- if (state == GS_APP_STATE_LOCAL)
- return "local";
- if (state == GS_APP_STATE_QUEUED)
- return "queued";
- if (state == GS_APP_STATE_INSTALLING)
- return "installing";
- if (state == GS_APP_STATE_REMOVING)
- return "removing";
- if (state == GS_APP_STATE_UPDATABLE)
- return "updatable";
- if (state == GS_APP_STATE_UNAVAILABLE)
- return "unavailable";
- return NULL;
-}
-
-/**
* gs_app_to_string:
**/
gchar *
@@ -205,7 +178,7 @@ gs_app_to_string (GsApp *app)
as_id_kind_to_string (priv->id_kind));
}
g_string_append_printf (str, "\tstate:\t%s\n",
- gs_app_state_to_string (priv->state));
+ as_app_state_to_string (priv->state));
if (priv->id_full != NULL)
g_string_append_printf (str, "\tid:\t%s\n", priv->id_full);
if ((priv->kudos & GS_APP_KUDO_MY_LANGUAGE) > 0)
@@ -403,10 +376,10 @@ gs_app_set_id (GsApp *app, const gchar *id)
/**
* gs_app_get_state:
*/
-GsAppState
+AsAppState
gs_app_get_state (GsApp *app)
{
- g_return_val_if_fail (GS_IS_APP (app), GS_APP_STATE_UNKNOWN);
+ g_return_val_if_fail (GS_IS_APP (app), AS_APP_STATE_UNKNOWN);
return app->priv->state;
}
@@ -414,7 +387,7 @@ gs_app_get_state (GsApp *app)
* gs_app_set_state_internal:
*/
static gboolean
-gs_app_set_state_internal (GsApp *app, GsAppState state)
+gs_app_set_state_internal (GsApp *app, AsAppState state)
{
gboolean state_change_ok = FALSE;
GsAppPrivate *priv = app->priv;
@@ -424,70 +397,70 @@ gs_app_set_state_internal (GsApp *app, GsAppState state)
/* check the state change is allowed */
switch (priv->state) {
- case GS_APP_STATE_UNKNOWN:
+ case AS_APP_STATE_UNKNOWN:
/* unknown has to go into one of the stable states */
- if (state == GS_APP_STATE_INSTALLED ||
- state == GS_APP_STATE_QUEUED ||
- state == GS_APP_STATE_AVAILABLE ||
- state == GS_APP_STATE_LOCAL ||
- state == GS_APP_STATE_UPDATABLE ||
- state == GS_APP_STATE_UNAVAILABLE)
+ if (state == AS_APP_STATE_INSTALLED ||
+ state == AS_APP_STATE_QUEUED_FOR_INSTALL ||
+ state == AS_APP_STATE_AVAILABLE ||
+ state == AS_APP_STATE_AVAILABLE_LOCAL ||
+ state == AS_APP_STATE_UPDATABLE ||
+ state == AS_APP_STATE_UNAVAILABLE)
state_change_ok = TRUE;
break;
- case GS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_INSTALLED:
/* installed has to go into an action state */
- if (state == GS_APP_STATE_UNKNOWN ||
- state == GS_APP_STATE_REMOVING)
+ if (state == AS_APP_STATE_UNKNOWN ||
+ state == AS_APP_STATE_REMOVING)
state_change_ok = TRUE;
break;
- case GS_APP_STATE_QUEUED:
- if (state == GS_APP_STATE_UNKNOWN ||
- state == GS_APP_STATE_INSTALLING ||
- state == GS_APP_STATE_AVAILABLE)
+ case AS_APP_STATE_QUEUED_FOR_INSTALL:
+ if (state == AS_APP_STATE_UNKNOWN ||
+ state == AS_APP_STATE_INSTALLING ||
+ state == AS_APP_STATE_AVAILABLE)
state_change_ok = TRUE;
break;
- case GS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_AVAILABLE:
/* available has to go into an action state */
- if (state == GS_APP_STATE_UNKNOWN ||
- state == GS_APP_STATE_QUEUED ||
- state == GS_APP_STATE_INSTALLING)
+ if (state == AS_APP_STATE_UNKNOWN ||
+ state == AS_APP_STATE_QUEUED_FOR_INSTALL ||
+ state == AS_APP_STATE_INSTALLING)
state_change_ok = TRUE;
break;
- case GS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_INSTALLING:
/* installing has to go into an stable state */
- if (state == GS_APP_STATE_UNKNOWN ||
- state == GS_APP_STATE_INSTALLED ||
- state == GS_APP_STATE_AVAILABLE)
+ if (state == AS_APP_STATE_UNKNOWN ||
+ state == AS_APP_STATE_INSTALLED ||
+ state == AS_APP_STATE_AVAILABLE)
state_change_ok = TRUE;
break;
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_REMOVING:
/* removing has to go into an stable state */
- if (state == GS_APP_STATE_UNKNOWN ||
- state == GS_APP_STATE_AVAILABLE ||
- state == GS_APP_STATE_INSTALLED)
+ if (state == AS_APP_STATE_UNKNOWN ||
+ state == AS_APP_STATE_AVAILABLE ||
+ state == AS_APP_STATE_INSTALLED)
state_change_ok = TRUE;
break;
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_UPDATABLE:
/* updatable has to go into an action state */
- if (state == GS_APP_STATE_UNKNOWN ||
- state == GS_APP_STATE_REMOVING)
+ if (state == AS_APP_STATE_UNKNOWN ||
+ state == AS_APP_STATE_REMOVING)
state_change_ok = TRUE;
break;
- case GS_APP_STATE_UNAVAILABLE:
+ case AS_APP_STATE_UNAVAILABLE:
/* updatable has to go into an action state */
- if (state == GS_APP_STATE_UNKNOWN ||
- state == GS_APP_STATE_AVAILABLE)
+ if (state == AS_APP_STATE_UNKNOWN ||
+ state == AS_APP_STATE_AVAILABLE)
state_change_ok = TRUE;
break;
- case GS_APP_STATE_LOCAL:
+ case AS_APP_STATE_AVAILABLE_LOCAL:
/* local has to go into an action state */
- if (state == GS_APP_STATE_UNKNOWN ||
- state == GS_APP_STATE_INSTALLING)
+ if (state == AS_APP_STATE_UNKNOWN ||
+ state == AS_APP_STATE_INSTALLING)
state_change_ok = TRUE;
break;
default:
g_warning ("state %s unhandled",
- gs_app_state_to_string (priv->state));
+ as_app_state_to_string (priv->state));
g_assert_not_reached ();
}
@@ -495,16 +468,16 @@ gs_app_set_state_internal (GsApp *app, GsAppState state)
if (!state_change_ok) {
g_warning ("State change on %s from %s to %s is not OK",
priv->id,
- gs_app_state_to_string (priv->state),
- gs_app_state_to_string (state));
+ as_app_state_to_string (priv->state),
+ as_app_state_to_string (state));
return FALSE;
}
priv->state = state;
- if (state == GS_APP_STATE_UNKNOWN ||
- state == GS_APP_STATE_LOCAL ||
- state == GS_APP_STATE_AVAILABLE)
+ if (state == AS_APP_STATE_UNKNOWN ||
+ state == AS_APP_STATE_AVAILABLE_LOCAL ||
+ state == AS_APP_STATE_AVAILABLE)
app->priv->install_date = 0;
return TRUE;
@@ -514,7 +487,7 @@ gs_app_set_state_internal (GsApp *app, GsAppState state)
* gs_app_set_state:
*
* This sets the state of the application. The following state diagram explains
- * the typical states. All applications start in state %GS_APP_STATE_UNKNOWN,
+ * the typical states. All applications start in state %AS_APP_STATE_UNKNOWN,
* but the frontend is not supposed to see GsApps with this state, ever.
* Backend plugins are reponsible for changing the state to one of the other
* states before the GsApp is passed to the frontend. This is enforced by the
@@ -528,7 +501,7 @@ gs_app_set_state_internal (GsApp *app, GsAppState state)
* UNKNOWN --> UNAVAILABLE
*/
void
-gs_app_set_state (GsApp *app, GsAppState state)
+gs_app_set_state (GsApp *app, AsAppState state)
{
g_return_if_fail (GS_IS_APP (app));
@@ -1760,12 +1733,12 @@ gs_app_subsume (GsApp *app, GsApp *other)
/* an [updatable] installable package is more information than
* just the fact that something is installed */
- if (priv2->state == GS_APP_STATE_UPDATABLE &&
- priv->state == GS_APP_STATE_INSTALLED) {
+ if (priv2->state == AS_APP_STATE_UPDATABLE &&
+ priv->state == AS_APP_STATE_INSTALLED) {
/* we have to do the little dance to appease the
* angry gnome controlling the state-machine */
- gs_app_set_state_internal (app, GS_APP_STATE_UNKNOWN);
- gs_app_set_state_internal (app, GS_APP_STATE_UPDATABLE);
+ gs_app_set_state_internal (app, AS_APP_STATE_UNKNOWN);
+ gs_app_set_state_internal (app, AS_APP_STATE_UPDATABLE);
}
/* save any properties we already know */
@@ -1973,9 +1946,9 @@ gs_app_class_init (GsAppClass *klass)
* GsApp:state:
*/
pspec = g_param_spec_uint ("state", NULL, NULL,
- GS_APP_STATE_UNKNOWN,
- GS_APP_STATE_LAST,
- GS_APP_STATE_UNKNOWN,
+ AS_APP_STATE_UNKNOWN,
+ AS_APP_STATE_LAST,
+ AS_APP_STATE_UNKNOWN,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
g_object_class_install_property (object_class, PROP_STATE, pspec);
diff --git a/src/gs-app.h b/src/gs-app.h
index 54de9a0..b88aa4c 100644
--- a/src/gs-app.h
+++ b/src/gs-app.h
@@ -67,19 +67,6 @@ typedef enum {
} GsAppKind;
typedef enum {
- GS_APP_STATE_UNKNOWN,
- GS_APP_STATE_INSTALLED,
- GS_APP_STATE_AVAILABLE,
- GS_APP_STATE_QUEUED,
- GS_APP_STATE_INSTALLING,
- GS_APP_STATE_REMOVING,
- GS_APP_STATE_UPDATABLE,
- GS_APP_STATE_UNAVAILABLE, /* we found a reference to this */
- GS_APP_STATE_LOCAL,
- GS_APP_STATE_LAST
-} GsAppState;
-
-typedef enum {
GS_APP_RATING_KIND_UNKNOWN,
GS_APP_RATING_KIND_USER,
GS_APP_RATING_KIND_SYSTEM,
@@ -127,7 +114,6 @@ GType gs_app_get_type (void);
GsApp *gs_app_new (const gchar *id);
gchar *gs_app_to_string (GsApp *app);
const gchar *gs_app_kind_to_string (GsAppKind kind);
-const gchar *gs_app_state_to_string (GsAppState state);
void gs_app_subsume (GsApp *app,
GsApp *other);
@@ -142,9 +128,9 @@ void gs_app_set_kind (GsApp *app,
AsIdKind gs_app_get_id_kind (GsApp *app);
void gs_app_set_id_kind (GsApp *app,
AsIdKind id_kind);
-GsAppState gs_app_get_state (GsApp *app);
+AsAppState gs_app_get_state (GsApp *app);
void gs_app_set_state (GsApp *app,
- GsAppState state);
+ AsAppState state);
const gchar *gs_app_get_name (GsApp *app);
void gs_app_set_name (GsApp *app,
GsAppQuality quality,
diff --git a/src/gs-feature-tile.c b/src/gs-feature-tile.c
index 4685316..c0ef2c5 100644
--- a/src/gs-feature-tile.c
+++ b/src/gs-feature-tile.c
@@ -68,19 +68,19 @@ app_state_changed (GsApp *app, GParamSpec *pspec, GsFeatureTile *tile)
accessible = gtk_widget_get_accessible (priv->button);
switch (gs_app_get_state (app)) {
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_INSTALLING:
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_REMOVING:
name = g_strdup_printf ("%s (%s)",
gs_app_get_name (app),
_("Installed"));
break;
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_UPDATABLE:
name = g_strdup_printf ("%s (%s)",
gs_app_get_name (app),
_("Updates"));
break;
- case GS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_AVAILABLE:
default:
name = g_strdup (gs_app_get_name (app));
break;
diff --git a/src/gs-history-dialog.c b/src/gs-history-dialog.c
index 8adc226..8533f44 100644
--- a/src/gs-history-dialog.c
+++ b/src/gs-history-dialog.c
@@ -75,19 +75,19 @@ gs_history_dialog_set_app (GsHistoryDialog *dialog, GsApp *app)
/* add the action */
switch (gs_app_get_state (app)) {
- case GS_APP_STATE_AVAILABLE:
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_REMOVING:
/* TRANSLATORS: this is the status in the history UI,
* where we are showing the application was removed */
tmp = C_("app status", "Removed");
break;
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_INSTALLING:
/* TRANSLATORS: this is the status in the history UI,
* where we are showing the application was installed */
tmp = C_("app status", "Installed");
break;
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_UPDATABLE:
/* TRANSLATORS: this is the status in the history UI,
* where we are showing the application was updated */
tmp = C_("app status", "Updated");
diff --git a/src/gs-plugin-loader.c b/src/gs-plugin-loader.c
index ee71be3..ce36cdd 100644
--- a/src/gs-plugin-loader.c
+++ b/src/gs-plugin-loader.c
@@ -475,7 +475,7 @@ static gboolean
gs_plugin_loader_app_is_valid (GsApp *app, gpointer user_data)
{
/* don't show unknown state */
- if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN) {
+ if (gs_app_get_state (app) == AS_APP_STATE_UNKNOWN) {
g_debug ("app invalid as state unknown %s",
gs_plugin_loader_get_app_str (app));
return FALSE;
@@ -483,7 +483,7 @@ gs_plugin_loader_app_is_valid (GsApp *app, gpointer user_data)
/* don't show unconverted unavailables */
if (gs_app_get_kind (app) == GS_APP_KIND_UNKNOWN &&
- gs_app_get_state (app) == GS_APP_STATE_UNAVAILABLE) {
+ gs_app_get_state (app) == AS_APP_STATE_UNAVAILABLE) {
g_debug ("app invalid as unconverted unavailable %s",
gs_plugin_loader_get_app_str (app));
return FALSE;
@@ -686,8 +686,8 @@ typedef struct {
guint cache_age;
GsCategory *category;
GsApp *app;
- GsAppState state_success;
- GsAppState state_failure;
+ AsAppState state_success;
+ AsAppState state_failure;
} GsPluginLoaderAsyncState;
/******************************************************************************/
@@ -734,7 +734,7 @@ gs_plugin_loader_add_os_update_item (GList *list)
/* create new meta object */
app_os = gs_app_new ("os-update.virtual");
gs_app_set_kind (app_os, GS_APP_KIND_OS_UPDATE);
- gs_app_set_state (app_os, GS_APP_STATE_UPDATABLE);
+ gs_app_set_state (app_os, AS_APP_STATE_UPDATABLE);
gs_app_set_name (app_os,
GS_APP_QUALITY_NORMAL,
/* TRANSLATORS: this is a group of updates that are not
@@ -850,7 +850,7 @@ out:
* This means all of the #GsApp's returning from this function are of kind
* %GS_APP_KIND_NORMAL, %GS_APP_KIND_SYSTEM or %GS_APP_KIND_OS_UPDATE.
*
- * The #GsApps may be in state %GS_APP_STATE_INSTALLED or %GS_APP_STATE_AVAILABLE
+ * The #GsApps may be in state %AS_APP_STATE_INSTALLED or %AS_APP_STATE_AVAILABLE
* and the UI may want to filter the two classes of applications differently.
**/
void
@@ -1054,7 +1054,7 @@ out:
* This means all of the #GsApp's returning from this function are of kind
* %GS_APP_KIND_NORMAL.
*
- * The #GsApps will all initially be in state %GS_APP_STATE_INSTALLED.
+ * The #GsApps will all initially be in state %AS_APP_STATE_INSTALLED.
**/
void
gs_plugin_loader_get_installed_async (GsPluginLoader *plugin_loader,
@@ -1265,7 +1265,7 @@ out:
* This means all of the #GsApp's returning from this function are of kind
* %GS_APP_KIND_NORMAL or %GS_APP_KIND_SYSTEM.
*
- * The #GsApps may be in state %GS_APP_STATE_INSTALLED or %GS_APP_STATE_AVAILABLE
+ * The #GsApps may be in state %AS_APP_STATE_INSTALLED or %AS_APP_STATE_AVAILABLE
* and the UI may want to filter the two classes of applications differently.
**/
void
@@ -1366,7 +1366,7 @@ gs_plugin_loader_convert_unavailable (GList *list, const gchar *search)
if (gs_app_get_kind (app) != GS_APP_KIND_UNKNOWN &&
gs_app_get_kind (app) != GS_APP_KIND_MISSING)
continue;
- if (gs_app_get_state (app) != GS_APP_STATE_UNAVAILABLE)
+ if (gs_app_get_state (app) != AS_APP_STATE_UNAVAILABLE)
continue;
if (gs_app_get_id_kind (app) != AS_ID_KIND_CODEC)
continue;
@@ -1486,7 +1486,7 @@ out:
* This means all of the #GsApp's returning from this function are of kind
* %GS_APP_KIND_NORMAL.
*
- * The #GsApps may be in state %GS_APP_STATE_INSTALLED or %GS_APP_STATE_AVAILABLE
+ * The #GsApps may be in state %AS_APP_STATE_INSTALLED or %AS_APP_STATE_AVAILABLE
* and the UI may want to filter the two classes of applications differently.
**/
void
@@ -1761,7 +1761,7 @@ out:
* This means all of the #GsApp's returning from this function are of kind
* %GS_APP_KIND_NORMAL.
*
- * The #GsApps may be in state %GS_APP_STATE_INSTALLED or %GS_APP_STATE_AVAILABLE
+ * The #GsApps may be in state %AS_APP_STATE_INSTALLED or %AS_APP_STATE_AVAILABLE
* and the UI may want to filter the two classes of applications differently.
**/
void
@@ -1936,7 +1936,7 @@ gs_plugin_loader_app_action_thread_cb (GTask *task,
cancellable,
&error);
if (ret) {
- if (state->state_success != GS_APP_STATE_UNKNOWN) {
+ if (state->state_success != AS_APP_STATE_UNKNOWN) {
gs_app_set_state (state->app, state->state_success);
addons = gs_app_get_addons (state->app);
for (i = 0; i < addons->len; i++) {
@@ -1998,7 +1998,7 @@ load_install_queue (GsPluginLoader *plugin_loader, GError **error)
if (strlen (names[i]) == 0)
continue;
app = gs_app_new (names[i]);
- gs_app_set_state (app, GS_APP_STATE_QUEUED);
+ gs_app_set_state (app, AS_APP_STATE_QUEUED_FOR_INSTALL);
g_mutex_lock (&plugin_loader->priv->app_cache_mutex);
g_hash_table_insert (plugin_loader->priv->app_cache,
@@ -2051,7 +2051,7 @@ save_install_queue (GsPluginLoader *plugin_loader)
for (i = pending_apps->len - 1; i >= 0; i--) {
GsApp *app;
app = g_ptr_array_index (pending_apps, i);
- if (gs_app_get_state (app) == GS_APP_STATE_QUEUED) {
+ if (gs_app_get_state (app) == AS_APP_STATE_QUEUED_FOR_INSTALL) {
g_string_append (s, gs_app_get_id (app));
g_string_append_c (s, '\n');
}
@@ -2086,7 +2086,7 @@ add_app_to_install_queue (GsPluginLoader *plugin_loader, GsApp *app)
g_ptr_array_add (plugin_loader->priv->pending_apps, g_object_ref (app));
g_mutex_unlock (&plugin_loader->priv->pending_apps_mutex);
- gs_app_set_state (app, GS_APP_STATE_QUEUED);
+ gs_app_set_state (app, AS_APP_STATE_QUEUED_FOR_INSTALL);
id = g_idle_add (emit_pending_apps_idle, g_object_ref (plugin_loader));
g_source_set_name_by_id (id, "[gnome-software] emit_pending_apps_idle");
save_install_queue (plugin_loader);
@@ -2113,7 +2113,7 @@ remove_app_from_install_queue (GsPluginLoader *plugin_loader, GsApp *app)
g_mutex_unlock (&plugin_loader->priv->pending_apps_mutex);
if (ret) {
- gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+ gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
id = g_idle_add (emit_pending_apps_idle, g_object_ref (plugin_loader));
g_source_set_name_by_id (id, "[gnome-software] emit_pending_apps_idle");
save_install_queue (plugin_loader);
@@ -2175,18 +2175,18 @@ gs_plugin_loader_app_action_async (GsPluginLoader *plugin_loader,
switch (action) {
case GS_PLUGIN_LOADER_ACTION_INSTALL:
state->function_name = "gs_plugin_app_install";
- state->state_success = GS_APP_STATE_INSTALLED;
- state->state_failure = GS_APP_STATE_AVAILABLE;
+ state->state_success = AS_APP_STATE_INSTALLED;
+ state->state_failure = AS_APP_STATE_AVAILABLE;
break;
case GS_PLUGIN_LOADER_ACTION_REMOVE:
state->function_name = "gs_plugin_app_remove";
- state->state_success = GS_APP_STATE_AVAILABLE;
- state->state_failure = GS_APP_STATE_INSTALLED;
+ state->state_success = AS_APP_STATE_AVAILABLE;
+ state->state_failure = AS_APP_STATE_INSTALLED;
break;
case GS_PLUGIN_LOADER_ACTION_SET_RATING:
state->function_name = "gs_plugin_app_set_rating";
- state->state_success = GS_APP_STATE_UNKNOWN;
- state->state_failure = GS_APP_STATE_UNKNOWN;
+ state->state_success = AS_APP_STATE_UNKNOWN;
+ state->state_failure = AS_APP_STATE_UNKNOWN;
break;
default:
g_assert_not_reached ();
@@ -2224,10 +2224,10 @@ gs_plugin_loader_app_action_finish (GsPluginLoader *plugin_loader,
/**
* gs_plugin_loader_get_state_for_app:
**/
-GsAppState
+AsAppState
gs_plugin_loader_get_state_for_app (GsPluginLoader *plugin_loader, GsApp *app)
{
- GsAppState state = GS_APP_STATE_UNKNOWN;
+ AsAppState state = AS_APP_STATE_UNKNOWN;
GsApp *tmp;
GsPluginLoaderPrivate *priv = plugin_loader->priv;
guint i;
@@ -2763,7 +2763,7 @@ gs_plugin_loader_set_network_status (GsPluginLoader *plugin_loader,
g_mutex_lock (&plugin_loader->priv->pending_apps_mutex);
for (i = 0; i < plugin_loader->priv->pending_apps->len; i++) {
app = g_ptr_array_index (plugin_loader->priv->pending_apps, i);
- if (gs_app_get_state (app) == GS_APP_STATE_QUEUED)
+ if (gs_app_get_state (app) == AS_APP_STATE_QUEUED_FOR_INSTALL)
gs_plugin_add_app (&queue, app);
}
g_mutex_unlock (&plugin_loader->priv->pending_apps_mutex);
diff --git a/src/gs-plugin-loader.h b/src/gs-plugin-loader.h
index c51f33e..2875a18 100644
--- a/src/gs-plugin-loader.h
+++ b/src/gs-plugin-loader.h
@@ -188,7 +188,7 @@ void gs_plugin_loader_refresh_async (GsPluginLoader
*plugin_loader,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GsAppState gs_plugin_loader_get_state_for_app (GsPluginLoader *plugin_loader,
+AsAppState gs_plugin_loader_get_state_for_app (GsPluginLoader *plugin_loader,
GsApp *app);
GPtrArray *gs_plugin_loader_get_pending (GsPluginLoader *plugin_loader);
GsApp *gs_plugin_loader_dedupe (GsPluginLoader *plugin_loader,
diff --git a/src/gs-popular-tile.c b/src/gs-popular-tile.c
index 7cc89ef..801b87e 100644
--- a/src/gs-popular-tile.c
+++ b/src/gs-popular-tile.c
@@ -70,9 +70,9 @@ app_state_changed (GsApp *app, GParamSpec *pspec, GsPopularTile *tile)
label = gtk_bin_get_child (GTK_BIN (priv->eventbox));
switch (gs_app_get_state (app)) {
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_INSTALLING:
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_REMOVING:
installed = TRUE;
name = g_strdup_printf ("%s (%s)",
gs_app_get_name (app),
@@ -81,7 +81,7 @@ app_state_changed (GsApp *app, GParamSpec *pspec, GsPopularTile *tile)
* that tells the user the application is installed */
gtk_label_set_label (GTK_LABEL (label), _("Installed"));
break;
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_UPDATABLE:
installed = TRUE;
name = g_strdup_printf ("%s (%s)",
gs_app_get_name (app),
@@ -91,7 +91,7 @@ app_state_changed (GsApp *app, GParamSpec *pspec, GsPopularTile *tile)
* application available */
gtk_label_set_label (GTK_LABEL (label), _("Updates"));
break;
- case GS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_AVAILABLE:
default:
installed = FALSE;
name = g_strdup (gs_app_get_name (app));
diff --git a/src/gs-self-test.c b/src/gs-self-test.c
index 960e6d6..d50c594 100644
--- a/src/gs-self-test.c
+++ b/src/gs-self-test.c
@@ -460,7 +460,7 @@ gs_plugin_loader_func (void)
g_assert_cmpstr (gs_app_get_id (app), ==, "gnome-screenshot");
g_assert_cmpstr (gs_app_get_name (app), ==, "Screenshot");
g_assert_cmpstr (gs_app_get_summary (app), ==, "Save images of your screen or individual windows");
- g_assert_cmpint (gs_app_get_state (app), ==, GS_APP_STATE_INSTALLED);
+ g_assert_cmpint (gs_app_get_state (app), ==, AS_APP_STATE_INSTALLED);
g_assert_cmpint (gs_app_get_kind (app), ==, GS_APP_KIND_SYSTEM);
g_assert (gs_app_get_pixbuf (app) != NULL);
gs_plugin_list_free (list);
@@ -693,7 +693,7 @@ gs_plugin_loader_webapps_func (void)
&error);
g_assert_no_error (error);
g_assert (ret);
- g_assert_cmpint (gs_app_get_state (app), ==, GS_APP_STATE_UNAVAILABLE);
+ g_assert_cmpint (gs_app_get_state (app), ==, AS_APP_STATE_UNAVAILABLE);
g_unlink (path);
g_free (path);
diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c
index 930ee01..d4c66bc 100644
--- a/src/gs-shell-details.c
+++ b/src/gs-shell-details.c
@@ -143,7 +143,7 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
{
GsShellDetailsPrivate *priv = shell_details->priv;
GsAppKind kind;
- GsAppState state;
+ AsAppState state;
GtkWidget *widget;
GtkAdjustment *adj;
@@ -161,7 +161,7 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
/* label */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "header_label"));
switch (state) {
- case GS_APP_STATE_QUEUED:
+ case AS_APP_STATE_QUEUED_FOR_INSTALL:
gtk_widget_set_visible (widget, TRUE);
gtk_label_set_label (GTK_LABEL (widget), _("Pending"));
break;
@@ -173,8 +173,8 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
/* install button */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_install"));
switch (state) {
- case GS_APP_STATE_AVAILABLE:
- case GS_APP_STATE_LOCAL:
+ case AS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_AVAILABLE_LOCAL:
gtk_widget_set_visible (widget, gs_app_get_kind (priv->app) != GS_APP_KIND_CORE);
gtk_widget_set_sensitive (widget, TRUE);
gtk_style_context_add_class (gtk_widget_get_style_context (widget), "suggested-action");
@@ -182,10 +182,10 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
* can be installed */
gtk_button_set_label (GTK_BUTTON (widget), _("_Install"));
break;
- case GS_APP_STATE_QUEUED:
+ case AS_APP_STATE_QUEUED_FOR_INSTALL:
gtk_widget_set_visible (widget, FALSE);
break;
- case GS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_INSTALLING:
gtk_widget_set_visible (widget, TRUE);
gtk_widget_set_sensitive (widget, FALSE);
gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "suggested-action");
@@ -193,16 +193,16 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
* is in the process of being installed */
gtk_button_set_label (GTK_BUTTON (widget), _("_Installing"));
break;
- case GS_APP_STATE_UNKNOWN:
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_REMOVING:
- case GS_APP_STATE_UPDATABLE:
- case GS_APP_STATE_UNAVAILABLE:
+ case AS_APP_STATE_UNKNOWN:
+ case AS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_REMOVING:
+ case AS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_UNAVAILABLE:
gtk_widget_set_visible (widget, FALSE);
break;
default:
g_warning ("App unexpectedly in state %s",
- gs_app_state_to_string (state));
+ as_app_state_to_string (state));
g_assert_not_reached ();
}
@@ -212,37 +212,37 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
gtk_widget_set_visible (widget, FALSE);
} else {
switch (state) {
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_UPDATABLE:
gtk_widget_set_visible (widget, TRUE);
gtk_widget_set_sensitive (widget, TRUE);
gtk_style_context_add_class (gtk_widget_get_style_context (widget),
"destructive-action");
/* TRANSLATORS: button text in the header when an application can be erased */
gtk_button_set_label (GTK_BUTTON (widget), _("_Remove"));
break;
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_REMOVING:
gtk_widget_set_visible (widget, TRUE);
gtk_widget_set_sensitive (widget, FALSE);
gtk_style_context_remove_class (gtk_widget_get_style_context (widget),
"destructive-action");
/* TRANSLATORS: button text in the header when an application can be installed */
gtk_button_set_label (GTK_BUTTON (widget), _("_Removing"));
break;
- case GS_APP_STATE_QUEUED:
+ case AS_APP_STATE_QUEUED_FOR_INSTALL:
gtk_widget_set_visible (widget, TRUE);
gtk_widget_set_sensitive (widget, TRUE);
gtk_style_context_remove_class (gtk_widget_get_style_context (widget),
"destructive-action");
gtk_button_set_label (GTK_BUTTON (widget), _("_Cancel"));
break;
- case GS_APP_STATE_LOCAL:
- case GS_APP_STATE_AVAILABLE:
- case GS_APP_STATE_INSTALLING:
- case GS_APP_STATE_UNAVAILABLE:
- case GS_APP_STATE_UNKNOWN:
+ case AS_APP_STATE_AVAILABLE_LOCAL:
+ case AS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_UNAVAILABLE:
+ case AS_APP_STATE_UNKNOWN:
gtk_widget_set_visible (widget, FALSE);
break;
default:
g_warning ("App unexpectedly in state %s",
- gs_app_state_to_string (state));
+ as_app_state_to_string (state));
g_assert_not_reached ();
}
}
@@ -254,24 +254,24 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
gtk_spinner_stop (GTK_SPINNER (widget));
} else {
switch (state) {
- case GS_APP_STATE_UNKNOWN:
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_AVAILABLE:
- case GS_APP_STATE_QUEUED:
- case GS_APP_STATE_UPDATABLE:
- case GS_APP_STATE_UNAVAILABLE:
- case GS_APP_STATE_LOCAL:
+ case AS_APP_STATE_UNKNOWN:
+ case AS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_QUEUED_FOR_INSTALL:
+ case AS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_UNAVAILABLE:
+ case AS_APP_STATE_AVAILABLE_LOCAL:
gtk_widget_set_visible (widget, FALSE);
gtk_spinner_stop (GTK_SPINNER (widget));
break;
- case GS_APP_STATE_INSTALLING:
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_REMOVING:
gtk_spinner_start (GTK_SPINNER (widget));
gtk_widget_set_visible (widget, TRUE);
break;
default:
g_warning ("App unexpectedly in state %s",
- gs_app_state_to_string (state));
+ as_app_state_to_string (state));
g_assert_not_reached ();
}
}
@@ -554,7 +554,7 @@ gs_shell_details_refresh_all (GsShellDetails *shell_details)
}
if (pixbuf == NULL)
pixbuf = gs_app_get_pixbuf (priv->app);
- if (pixbuf == NULL && gs_app_get_state (priv->app) == GS_APP_STATE_LOCAL) {
+ if (pixbuf == NULL && gs_app_get_state (priv->app) == AS_APP_STATE_AVAILABLE_LOCAL) {
if (gs_app_get_kind (priv->app) == GS_APP_KIND_SOURCE)
pixbuf = gs_pixbuf_load ("x-package-repository", 96, NULL);
else if (gs_shell_details_is_addon_id_kind (priv->app))
@@ -655,11 +655,11 @@ gs_shell_details_refresh_all (GsShellDetails *shell_details)
gtk_label_set_label (GTK_LABEL (priv->label_details_origin_value), tmp);
}
gtk_widget_set_visible (priv->label_details_origin_value,
- gs_app_get_state (priv->app) == GS_APP_STATE_INSTALLED ||
- gs_app_get_state (priv->app) == GS_APP_STATE_LOCAL);
+ gs_app_get_state (priv->app) == AS_APP_STATE_INSTALLED ||
+ gs_app_get_state (priv->app) == AS_APP_STATE_AVAILABLE_LOCAL);
gtk_widget_set_visible (priv->label_details_origin_title,
- gs_app_get_state (priv->app) == GS_APP_STATE_INSTALLED ||
- gs_app_get_state (priv->app) == GS_APP_STATE_LOCAL);
+ gs_app_get_state (priv->app) == AS_APP_STATE_INSTALLED ||
+ gs_app_get_state (priv->app) == AS_APP_STATE_AVAILABLE_LOCAL);
/* set the rating */
switch (gs_app_get_id_kind (priv->app)) {
@@ -681,18 +681,18 @@ gs_shell_details_refresh_all (GsShellDetails *shell_details)
}
/* don't show a missing rating on a local file */
- if (gs_app_get_state (priv->app) == GS_APP_STATE_LOCAL &&
+ if (gs_app_get_state (priv->app) == AS_APP_STATE_AVAILABLE_LOCAL &&
gs_app_get_rating (priv->app) < 0)
gtk_widget_set_visible (priv->star, FALSE);
/* only mark the stars as sensitive if the application is installed */
gtk_widget_set_sensitive (priv->star,
- gs_app_get_state (priv->app) == GS_APP_STATE_INSTALLED);
+ gs_app_get_state (priv->app) == AS_APP_STATE_INSTALLED);
/* only show launch button when the application is installed */
switch (gs_app_get_state (priv->app)) {
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_UPDATABLE:
if (gs_app_get_id_kind (priv->app) == AS_ID_KIND_DESKTOP ||
gs_app_get_id_kind (priv->app) == AS_ID_KIND_WEB_APP) {
gtk_widget_set_visible (priv->button_details_launch, TRUE);
@@ -718,7 +718,7 @@ gs_shell_details_refresh_all (GsShellDetails *shell_details)
}
/* don't show missing history on a local file */
- if (gs_app_get_state (priv->app) == GS_APP_STATE_LOCAL &&
+ if (gs_app_get_state (priv->app) == AS_APP_STATE_AVAILABLE_LOCAL &&
history->len == 0)
gtk_widget_set_visible (priv->button_history, FALSE);
@@ -735,7 +735,7 @@ gs_shell_details_refresh_all (GsShellDetails *shell_details)
/* is this a repo-release */
switch (gs_app_get_kind (priv->app)) {
case GS_APP_KIND_SOURCE:
- gtk_widget_set_visible (priv->infobar_details_repo, gs_app_get_state (priv->app) ==
GS_APP_STATE_LOCAL);
+ gtk_widget_set_visible (priv->infobar_details_repo, gs_app_get_state (priv->app) ==
AS_APP_STATE_AVAILABLE_LOCAL);
break;
default:
gtk_widget_set_visible (priv->infobar_details_repo, FALSE);
@@ -747,7 +747,7 @@ gs_shell_details_refresh_all (GsShellDetails *shell_details)
switch (gs_app_get_kind (priv->app)) {
case GS_APP_KIND_NORMAL:
case GS_APP_KIND_SYSTEM:
- gtk_widget_set_visible (priv->infobar_details_app_repo, tmp != NULL && gs_app_get_state
(priv->app) == GS_APP_STATE_LOCAL);
+ gtk_widget_set_visible (priv->infobar_details_app_repo, tmp != NULL && gs_app_get_state
(priv->app) == AS_APP_STATE_AVAILABLE_LOCAL);
break;
default:
gtk_widget_set_visible (priv->infobar_details_app_repo, FALSE);
@@ -758,7 +758,7 @@ gs_shell_details_refresh_all (GsShellDetails *shell_details)
switch (gs_app_get_kind (priv->app)) {
case GS_APP_KIND_NORMAL:
case GS_APP_KIND_SYSTEM:
- gtk_widget_set_visible (priv->infobar_details_app_norepo, tmp == NULL && gs_app_get_state
(priv->app) == GS_APP_STATE_LOCAL);
+ gtk_widget_set_visible (priv->infobar_details_app_norepo, tmp == NULL && gs_app_get_state
(priv->app) == AS_APP_STATE_AVAILABLE_LOCAL);
break;
default:
gtk_widget_set_visible (priv->infobar_details_app_norepo, FALSE);
@@ -777,8 +777,8 @@ gs_shell_details_refresh_all (GsShellDetails *shell_details)
/* only show the "select addons" string if the app isn't yet installed */
switch (gs_app_get_state (priv->app)) {
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_UPDATABLE:
gtk_widget_set_visible (priv->label_addons_uninstalled_app, FALSE);
break;
default:
@@ -791,8 +791,8 @@ gs_shell_details_refresh_all (GsShellDetails *shell_details)
for (l = addons; l; l = l->next) {
/* show checkboxes in front of addons if the app isn't yet installed */
switch (gs_app_get_state (priv->app)) {
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_UPDATABLE:
break;
default:
break;
@@ -1040,7 +1040,7 @@ gs_shell_details_app_installed_cb (GObject *source,
}
/* only show this if the window is not active */
- if (gs_app_get_state (helper->app) != GS_APP_STATE_QUEUED &&
+ if (gs_app_get_state (helper->app) != AS_APP_STATE_QUEUED_FOR_INSTALL &&
!gs_shell_is_active (helper->shell_details->priv->shell))
gs_app_notify_installed (helper->app);
gs_shell_details_refresh_all (helper->shell_details);
@@ -1117,7 +1117,7 @@ gs_shell_details_app_remove (GsShellDetails *shell_details, GsApp *app)
gs_app_get_name (app));
/* TRANSLATORS: this is button text to remove the application */
gtk_dialog_add_button (GTK_DIALOG (dialog), _("Remove"), GTK_RESPONSE_OK);
- if (gs_app_get_state (app) == GS_APP_STATE_INSTALLED)
+ if (gs_app_get_state (app) == AS_APP_STATE_INSTALLED)
response = gtk_dialog_run (GTK_DIALOG (dialog));
else
response = GTK_RESPONSE_OK; /* pending install */
@@ -1183,7 +1183,7 @@ gs_shell_details_app_install_button_cb (GtkWidget *widget, GsShellDetails *shell
if (gs_app_addon_row_get_selected (l->data)) {
GsApp *addon = gs_app_addon_row_get_addon (l->data);
- if (gs_app_get_state (addon) == GS_APP_STATE_AVAILABLE)
+ if (gs_app_get_state (addon) == AS_APP_STATE_AVAILABLE)
gs_app_set_to_be_installed (addon, TRUE);
}
}
@@ -1209,8 +1209,8 @@ gs_shell_details_addon_selected_cb (GsAppAddonRow *row,
* triggers an immediate install. Otherwise we'll install the addon
* together with the main app. */
switch (gs_app_get_state (priv->app)) {
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_UPDATABLE:
if (gs_app_addon_row_get_selected (row))
gs_shell_details_app_install (shell_details, addon);
else
diff --git a/src/gs-shell-installed.c b/src/gs-shell-installed.c
index 5c004a4..e37910a 100644
--- a/src/gs-shell-installed.c
+++ b/src/gs-shell-installed.c
@@ -182,7 +182,7 @@ gs_shell_installed_app_remove_cb (GsAppRow *app_row,
gs_app_get_name (app));
/* TRANSLATORS: this is button text to remove the application */
gtk_dialog_add_button (GTK_DIALOG (dialog), _("Remove"), GTK_RESPONSE_OK);
- if (gs_app_get_state (app) == GS_APP_STATE_QUEUED)
+ if (gs_app_get_state (app) == AS_APP_STATE_QUEUED_FOR_INSTALL)
response = GTK_RESPONSE_OK; /* pending install */
else
response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -362,11 +362,11 @@ gs_shell_installed_get_app_sort_key (GsApp *app)
/* sort installed, removing, other */
switch (gs_app_get_state (app)) {
- case GS_APP_STATE_INSTALLING:
- case GS_APP_STATE_QUEUED:
+ case AS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_QUEUED_FOR_INSTALL:
g_string_append (key, "1:");
break;
- case GS_APP_STATE_REMOVING:
+ case AS_APP_STATE_REMOVING:
g_string_append (key, "2:");
break;
default:
diff --git a/src/gs-shell-search-provider.c b/src/gs-shell-search-provider.c
index 3448392..f168bd9 100644
--- a/src/gs-shell-search-provider.c
+++ b/src/gs-shell-search-provider.c
@@ -135,7 +135,7 @@ search_done_cb (GObject *source,
g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
for (l = list; l != NULL; l = l->next) {
GsApp *app = GS_APP (l->data);
- if (gs_app_get_state (app) != GS_APP_STATE_AVAILABLE)
+ if (gs_app_get_state (app) != AS_APP_STATE_AVAILABLE)
continue;
g_variant_builder_add (&builder, "s", gs_app_get_id (app));
}
diff --git a/src/gs-shell-search.c b/src/gs-shell-search.c
index 47e43e7..680de4c 100644
--- a/src/gs-shell-search.c
+++ b/src/gs-shell-search.c
@@ -226,11 +226,11 @@ gs_shell_search_app_row_clicked_cb (GsAppRow *app_row,
{
GsApp *app;
app = gs_app_row_get_app (app_row);
- if (gs_app_get_state (app) == GS_APP_STATE_AVAILABLE)
+ if (gs_app_get_state (app) == AS_APP_STATE_AVAILABLE)
gs_shell_search_app_install (shell_search, app);
- else if (gs_app_get_state (app) == GS_APP_STATE_INSTALLED)
+ else if (gs_app_get_state (app) == AS_APP_STATE_INSTALLED)
gs_shell_search_app_remove (shell_search, app);
- else if (gs_app_get_state (app) == GS_APP_STATE_UNAVAILABLE)
+ else if (gs_app_get_state (app) == AS_APP_STATE_UNAVAILABLE)
gs_shell_search_show_missing_url (app);
}
diff --git a/src/plugins/gs-plugin-appstream.c b/src/plugins/gs-plugin-appstream.c
index 8983e4b..27d02f5 100644
--- a/src/plugins/gs-plugin-appstream.c
+++ b/src/plugins/gs-plugin-appstream.c
@@ -435,13 +435,13 @@ gs_plugin_refine_item (GsPlugin *plugin,
}
/* is installed already */
- if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN) {
+ if (gs_app_get_state (app) == AS_APP_STATE_UNKNOWN) {
switch (as_app_get_source_kind (item)) {
case AS_APP_SOURCE_KIND_APPDATA:
case AS_APP_SOURCE_KIND_DESKTOP:
gs_app_set_kind (app, GS_APP_KIND_NORMAL);
case AS_APP_SOURCE_KIND_METAINFO:
- gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+ gs_app_set_state (app, AS_APP_STATE_INSTALLED);
break;
default:
break;
diff --git a/src/plugins/gs-plugin-dummy.c b/src/plugins/gs-plugin-dummy.c
index 1d9b921..d957612 100644
--- a/src/plugins/gs-plugin-dummy.c
+++ b/src/plugins/gs-plugin-dummy.c
@@ -132,7 +132,7 @@ gs_plugin_add_installed (GsPlugin *plugin,
app = gs_app_new ("gnome-power-manager");
gs_app_set_name (app, GS_APP_QUALITY_NORMAL, "Power Manager");
gs_app_set_summary (app, GS_APP_QUALITY_NORMAL, "Power Management Program");
- gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+ gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
gs_app_set_kind (app, GS_APP_KIND_NORMAL);
gs_plugin_add_app (list, app);
gs_app_set_id_kind (app, AS_ID_KIND_DESKTOP);
@@ -154,7 +154,7 @@ gs_plugin_add_popular (GsPlugin *plugin,
app = gs_app_new ("gnome-power-manager");
gs_app_set_name (app, GS_APP_QUALITY_NORMAL, "Power Manager");
gs_app_set_summary (app, GS_APP_QUALITY_NORMAL, "Power Management Program");
- gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+ gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
gs_app_set_kind (app, GS_APP_KIND_NORMAL);
gs_plugin_add_app (list, app);
gs_app_set_id_kind (app, AS_ID_KIND_DESKTOP);
@@ -203,7 +203,7 @@ gs_plugin_add_category_apps (GsPlugin *plugin,
gs_app_set_summary (app, GS_APP_QUALITY_NORMAL, "View and use virtual machines");
gs_app_set_url (app, GS_APP_URL_KIND_HOMEPAGE, "http://www.box.org";);
gs_app_set_kind (app, GS_APP_KIND_NORMAL);
- gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+ gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
gs_app_set_pixbuf (app, gdk_pixbuf_new_from_file
("/usr/share/icons/hicolor/48x48/apps/gnome-boxes.png", NULL));
gs_app_set_id_kind (app, AS_ID_KIND_DESKTOP);
gs_plugin_add_app (list, app);
diff --git a/src/plugins/gs-plugin-epiphany.c b/src/plugins/gs-plugin-epiphany.c
index 924a446..b4899f1 100644
--- a/src/plugins/gs-plugin-epiphany.c
+++ b/src/plugins/gs-plugin-epiphany.c
@@ -149,8 +149,8 @@ gs_plugin_add_installed_file (GsPlugin *plugin,
gs_app_set_summary (*app, GS_APP_QUALITY_NORMAL, comment);
/* TRANSLATORS: this is the licence of the web-app */
gs_app_set_licence (*app, _("Proprietary"));
- gs_app_set_state (*app, no_display ? GS_APP_STATE_AVAILABLE :
- GS_APP_STATE_INSTALLED);
+ gs_app_set_state (*app, no_display ? AS_APP_STATE_AVAILABLE :
+ AS_APP_STATE_INSTALLED);
gs_app_set_kind (*app, GS_APP_KIND_NORMAL);
gs_app_set_id_kind (*app, AS_ID_KIND_WEB_APP);
gs_app_add_source_id (*app, path);
@@ -234,7 +234,7 @@ gs_plugin_add_installed (GsPlugin *plugin,
/* add all installed apps */
for (l = plugin->priv->list; l != NULL; l = l->next) {
app = GS_APP (l->data);
- if (gs_app_get_state (app) != GS_APP_STATE_INSTALLED)
+ if (gs_app_get_state (app) != AS_APP_STATE_INSTALLED)
continue;
gs_plugin_add_app (list, app);
}
@@ -369,11 +369,11 @@ gs_plugin_app_install (GsPlugin *plugin,
filename = gs_app_get_source_id_default (app);
if (filename == NULL)
goto out;
- gs_app_set_state (app, GS_APP_STATE_INSTALLING);
+ gs_app_set_state (app, AS_APP_STATE_INSTALLING);
ret = gs_plugin_app_set_enabled (filename, TRUE, error);
if (!ret)
goto out;
- gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+ gs_app_set_state (app, AS_APP_STATE_INSTALLED);
out:
return ret;
}
@@ -405,11 +405,11 @@ gs_plugin_app_remove (GsPlugin *plugin,
filename = gs_app_get_source_id_default (app);
if (filename == NULL)
goto out;
- gs_app_set_state (app, GS_APP_STATE_REMOVING);
+ gs_app_set_state (app, AS_APP_STATE_REMOVING);
ret = gs_plugin_app_set_enabled (filename, FALSE, error);
if (!ret)
goto out;
- gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+ gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
out:
return ret;
}
@@ -461,8 +461,8 @@ gs_plugin_write_file (GsApp *app, const gchar *filename, GError **error)
G_KEY_FILE_DESKTOP_KEY_TERMINAL,
FALSE);
switch (gs_app_get_state (app)) {
- case GS_APP_STATE_INSTALLING:
- case GS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_INSTALLING:
+ case AS_APP_STATE_INSTALLED:
enabled = TRUE;
break;
default:
@@ -616,7 +616,7 @@ gs_plugin_refine_app (GsPlugin *plugin, GsApp *app, GError **error)
GError *error_local = NULL;
/* this is not yet installed */
- gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+ gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
/* calculate SHA1 hash of name */
hash = g_compute_checksum_for_string (G_CHECKSUM_SHA1, gs_app_get_name (app), -1);
@@ -637,8 +637,8 @@ gs_plugin_refine_app (GsPlugin *plugin, GsApp *app, GError **error)
&error_local);
if (!ret) {
/* this isn't a fatal error */
- gs_app_set_state (app, GS_APP_STATE_UNKNOWN);
- gs_app_set_state (app, GS_APP_STATE_UNAVAILABLE);
+ gs_app_set_state (app, AS_APP_STATE_UNKNOWN);
+ gs_app_set_state (app, AS_APP_STATE_UNAVAILABLE);
g_debug ("Failed to download %s: %s",
gs_app_get_icon (app), error_local->message);
g_error_free (error_local);
diff --git a/src/plugins/gs-plugin-packagekit-history.c b/src/plugins/gs-plugin-packagekit-history.c
index 5ef7641..6670c5b 100644
--- a/src/plugins/gs-plugin-packagekit-history.c
+++ b/src/plugins/gs-plugin-packagekit-history.c
@@ -96,13 +96,13 @@ gs_plugin_packagekit_refine_add_history (GsApp *app, GVariant *dict)
g_assert (ret);
switch (info_enum) {
case PK_INFO_ENUM_INSTALLING:
- gs_app_set_state (history, GS_APP_STATE_INSTALLED);
+ gs_app_set_state (history, AS_APP_STATE_INSTALLED);
break;
case PK_INFO_ENUM_REMOVING:
- gs_app_set_state (history, GS_APP_STATE_AVAILABLE);
+ gs_app_set_state (history, AS_APP_STATE_AVAILABLE);
break;
case PK_INFO_ENUM_UPDATING:
- gs_app_set_state (history, GS_APP_STATE_UPDATABLE);
+ gs_app_set_state (history, AS_APP_STATE_UPDATABLE);
break;
default:
ret = FALSE;
@@ -237,11 +237,11 @@ gs_plugin_packagekit_refine (GsPlugin *plugin,
if (!ret) {
/* make up a fake entry as we know this package was at
* least installed at some point in time */
- if (gs_app_get_state (app) == GS_APP_STATE_INSTALLED) {
+ if (gs_app_get_state (app) == AS_APP_STATE_INSTALLED) {
app_dummy = gs_app_new (gs_app_get_id_full (app));
gs_app_set_install_date (app_dummy, GS_APP_INSTALL_DATE_UNKNOWN);
gs_app_set_kind (app_dummy, GS_APP_KIND_PACKAGE);
- gs_app_set_state (app_dummy, GS_APP_STATE_INSTALLED);
+ gs_app_set_state (app_dummy, AS_APP_STATE_INSTALLED);
gs_app_set_version (app_dummy, gs_app_get_version (app));
gs_app_add_history (app, app_dummy);
g_object_unref (app_dummy);
diff --git a/src/plugins/gs-plugin-packagekit-offline.c b/src/plugins/gs-plugin-packagekit-offline.c
index 63a9bb9..20eb00a 100644
--- a/src/plugins/gs-plugin-packagekit-offline.c
+++ b/src/plugins/gs-plugin-packagekit-offline.c
@@ -107,7 +107,7 @@ gs_plugin_add_updates_historical (GsPlugin *plugin,
gs_app_set_update_version (app, split[1]);
gs_app_set_management_plugin (app, "PackageKit");
gs_app_add_source_id (app, package_ids[i]);
- gs_app_set_state (app, GS_APP_STATE_UPDATABLE);
+ gs_app_set_state (app, AS_APP_STATE_UPDATABLE);
gs_app_set_kind (app, GS_APP_KIND_PACKAGE);
gs_plugin_add_app (list, app);
g_strfreev (split);
diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c
index 8c1cb38..40d64ed 100644
--- a/src/plugins/gs-plugin-packagekit-refine.c
+++ b/src/plugins/gs-plugin-packagekit-refine.c
@@ -161,7 +161,7 @@ gs_plugin_packagekit_resolve_packages_app (GsPlugin *plugin,
gs_app_set_management_plugin (app, "PackageKit");
gs_app_add_source_id (app, pk_package_get_id (package));
switch (pk_package_get_info (package)) {
- case GS_APP_STATE_INSTALLED:
+ case AS_APP_STATE_INSTALLED:
number_installed++;
data = pk_package_get_data (package);
if (g_str_has_prefix (data, "installed:")) {
@@ -170,7 +170,7 @@ gs_plugin_packagekit_resolve_packages_app (GsPlugin *plugin,
data + 10);
}
break;
- case GS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_AVAILABLE:
number_available++;
break;
default:
@@ -195,24 +195,24 @@ gs_plugin_packagekit_resolve_packages_app (GsPlugin *plugin,
/* if *all* the source packages for the app are installed then the
* application is considered completely installed */
if (number_installed == sources->len && number_available == 0) {
- if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN)
- gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+ if (gs_app_get_state (app) == AS_APP_STATE_UNKNOWN)
+ gs_app_set_state (app, AS_APP_STATE_INSTALLED);
} else if (number_installed + number_available == sources->len) {
/* if all the source packages are installed and all the rest
* of the packages are available then the app is available */
- if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN)
- gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+ if (gs_app_get_state (app) == AS_APP_STATE_UNKNOWN)
+ gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
} else if (number_installed + number_available > sources->len) {
/* we have more packages returned than source packages */
- gs_app_set_state (app, GS_APP_STATE_UNKNOWN);
- gs_app_set_state (app, GS_APP_STATE_UPDATABLE);
+ gs_app_set_state (app, AS_APP_STATE_UNKNOWN);
+ gs_app_set_state (app, AS_APP_STATE_UPDATABLE);
} else if (number_installed + number_available < sources->len) {
/* we have less packages returned than source packages */
tmp = gs_app_to_string (app);
g_debug ("Failed to find all packages for:\n%s", tmp);
g_free (tmp);
gs_app_set_kind (app, GS_APP_KIND_UNKNOWN);
- gs_app_set_state (app, GS_APP_STATE_UNAVAILABLE);
+ gs_app_set_state (app, AS_APP_STATE_UNAVAILABLE);
}
}
@@ -338,7 +338,7 @@ gs_plugin_packagekit_refine_from_desktop (GsPlugin *plugin,
if (packages->len == 1) {
package = g_ptr_array_index (packages, 0);
gs_app_add_source_id (app, pk_package_get_id (package));
- gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+ gs_app_set_state (app, AS_APP_STATE_INSTALLED);
gs_app_set_management_plugin (app, "PackageKit");
} else {
g_warning ("Failed to find one package for %s, %s, [%d]",
@@ -756,7 +756,7 @@ gs_plugin_refine (GsPlugin *plugin,
sources = gs_app_get_sources (app);
if (sources->len == 0)
continue;
- if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN ||
+ if (gs_app_get_state (app) == AS_APP_STATE_UNKNOWN ||
gs_plugin_refine_requires_package_id (app, flags) ||
gs_plugin_refine_requires_version (app, flags)) {
resolve_all = g_list_prepend (resolve_all, app);
@@ -797,7 +797,7 @@ gs_plugin_refine (GsPlugin *plugin,
gs_profile_start (plugin->profile, "packagekit-refine[id->update-details]");
for (l = *list; l != NULL; l = l->next) {
app = GS_APP (l->data);
- if (gs_app_get_state (app) != GS_APP_STATE_UPDATABLE)
+ if (gs_app_get_state (app) != AS_APP_STATE_UPDATABLE)
continue;
if (gs_plugin_refine_requires_update_details (app, flags))
updatedetails_all = g_list_prepend (updatedetails_all, app);
diff --git a/src/plugins/gs-plugin-packagekit-refresh.c b/src/plugins/gs-plugin-packagekit-refresh.c
index d8acde6..18a2e0b 100644
--- a/src/plugins/gs-plugin-packagekit-refresh.c
+++ b/src/plugins/gs-plugin-packagekit-refresh.c
@@ -261,7 +261,7 @@ gs_plugin_filename_to_app (GsPlugin *plugin,
basename = g_path_get_basename (filename);
gs_app_set_management_plugin (app, "PackageKit");
gs_app_set_kind (app, GS_APP_KIND_PACKAGE);
- gs_app_set_state (app, GS_APP_STATE_LOCAL);
+ gs_app_set_state (app, AS_APP_STATE_AVAILABLE_LOCAL);
#if PK_CHECK_VERSION(0,9,1)
if (pk_details_get_summary (item))
gs_app_set_name (app, GS_APP_QUALITY_LOWEST,
diff --git a/src/plugins/gs-plugin-packagekit-updates.c b/src/plugins/gs-plugin-packagekit-updates.c
index 1f7d283..95e513d 100644
--- a/src/plugins/gs-plugin-packagekit-updates.c
+++ b/src/plugins/gs-plugin-packagekit-updates.c
@@ -140,7 +140,7 @@ gs_plugin_add_updates (GsPlugin *plugin,
gs_app_add_source_id (app, pk_package_get_id (pkg));
gs_app_set_update_version (app, pk_package_get_version (pkg));
gs_app_set_management_plugin (app, "PackageKit");
- gs_app_set_state (app, GS_APP_STATE_UPDATABLE);
+ gs_app_set_state (app, AS_APP_STATE_UPDATABLE);
gs_app_set_kind (app, GS_APP_KIND_PACKAGE);
gs_plugin_add_app (list, app);
}
diff --git a/src/plugins/gs-plugin-packagekit.c b/src/plugins/gs-plugin-packagekit.c
index cf29fe9..379ef44 100644
--- a/src/plugins/gs-plugin-packagekit.c
+++ b/src/plugins/gs-plugin-packagekit.c
@@ -244,7 +244,7 @@ gs_plugin_add_sources (GsPlugin *plugin,
app = gs_app_new (id);
gs_app_set_management_plugin (app, "PackageKit");
gs_app_set_kind (app, GS_APP_KIND_SOURCE);
- gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+ gs_app_set_state (app, AS_APP_STATE_INSTALLED);
gs_app_set_name (app,
GS_APP_QUALITY_LOWEST,
pk_repo_detail_get_description (rd));
@@ -299,8 +299,8 @@ gs_plugin_app_install (GsPlugin *plugin,
/* get the list of available package ids to install */
switch (gs_app_get_state (app)) {
- case GS_APP_STATE_AVAILABLE:
- case GS_APP_STATE_UPDATABLE:
+ case AS_APP_STATE_AVAILABLE:
+ case AS_APP_STATE_UPDATABLE:
source_ids = gs_app_get_source_ids (app);
if (source_ids->len == 0) {
ret = FALSE;
@@ -343,12 +343,12 @@ gs_plugin_app_install (GsPlugin *plugin,
"no packages to install");
goto out;
}
- gs_app_set_state (app, GS_APP_STATE_INSTALLING);
+ gs_app_set_state (app, AS_APP_STATE_INSTALLING);
addons = gs_app_get_addons (app);
for (i = 0; i < addons->len; i++) {
GsApp *addon = g_ptr_array_index (addons, i);
if (gs_app_get_to_be_installed (addon))
- gs_app_set_state (addon, GS_APP_STATE_INSTALLING);
+ gs_app_set_state (addon, AS_APP_STATE_INSTALLING);
}
results = pk_task_install_packages_sync (plugin->priv->task,
(gchar **) array_package_ids->pdata,
@@ -360,7 +360,7 @@ gs_plugin_app_install (GsPlugin *plugin,
goto out;
}
break;
- case GS_APP_STATE_LOCAL:
+ case AS_APP_STATE_AVAILABLE_LOCAL:
package_id = gs_app_get_metadata_item (app, "PackageKit::local-filename");
if (package_id == NULL) {
ret = FALSE;
@@ -371,7 +371,7 @@ gs_plugin_app_install (GsPlugin *plugin,
goto out;
}
package_ids = g_strsplit (package_id, "\t", -1);
- gs_app_set_state (app, GS_APP_STATE_INSTALLING);
+ gs_app_set_state (app, AS_APP_STATE_INSTALLING);
results = pk_task_install_files_sync (plugin->priv->task,
package_ids,
cancellable,
@@ -388,7 +388,7 @@ gs_plugin_app_install (GsPlugin *plugin,
GS_PLUGIN_ERROR,
GS_PLUGIN_ERROR_FAILED,
"do not know how to install app in state %s",
- gs_app_state_to_string (gs_app_get_state (app)));
+ as_app_state_to_string (gs_app_get_state (app)));
goto out;
}
@@ -547,7 +547,7 @@ gs_plugin_app_remove (GsPlugin *plugin,
}
/* do the action */
- gs_app_set_state (app, GS_APP_STATE_REMOVING);
+ gs_app_set_state (app, AS_APP_STATE_REMOVING);
results = pk_task_remove_packages_sync (plugin->priv->task,
package_ids,
TRUE, FALSE,
diff --git a/src/plugins/gs-plugin-self-test.c b/src/plugins/gs-plugin-self-test.c
index 96e9eec..e010134 100644
--- a/src/plugins/gs-plugin-self-test.c
+++ b/src/plugins/gs-plugin-self-test.c
@@ -59,8 +59,8 @@ gs_plugin_refine (GsPlugin *plugin,
for (l = *list; l != NULL; l = l->next) {
app = GS_APP (l->data);
- if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN) {
- gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+ if (gs_app_get_state (app) == AS_APP_STATE_UNKNOWN) {
+ gs_app_set_state (app, AS_APP_STATE_INSTALLED);
gs_app_set_kind (app, GS_APP_KIND_NORMAL);
}
}
diff --git a/src/plugins/gs-plugin-systemd-updates.c b/src/plugins/gs-plugin-systemd-updates.c
index 5160777..31dd1a8 100644
--- a/src/plugins/gs-plugin-systemd-updates.c
+++ b/src/plugins/gs-plugin-systemd-updates.c
@@ -145,7 +145,7 @@ gs_plugin_add_updates (GsPlugin *plugin,
split = pk_package_id_split (package_ids[i]);
gs_app_add_source (app, split[PK_PACKAGE_ID_NAME]);
gs_app_set_update_version (app, split[PK_PACKAGE_ID_VERSION]);
- gs_app_set_state (app, GS_APP_STATE_UPDATABLE);
+ gs_app_set_state (app, AS_APP_STATE_UPDATABLE);
gs_app_set_kind (app, GS_APP_KIND_PACKAGE);
gs_plugin_add_app (list, app);
g_strfreev (split);
diff --git a/src/plugins/packagekit-common.c b/src/plugins/packagekit-common.c
index a3de9bb..38692bf 100644
--- a/src/plugins/packagekit-common.c
+++ b/src/plugins/packagekit-common.c
@@ -156,13 +156,13 @@ gs_plugin_packagekit_add_results (GsPlugin *plugin,
gs_app_set_version (app, pk_package_get_version (package));
switch (pk_package_get_info (package)) {
case PK_INFO_ENUM_INSTALLED:
- gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+ gs_app_set_state (app, AS_APP_STATE_INSTALLED);
break;
case PK_INFO_ENUM_AVAILABLE:
- gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+ gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
break;
default:
- gs_app_set_state (app, GS_APP_STATE_UNKNOWN);
+ gs_app_set_state (app, AS_APP_STATE_UNKNOWN);
g_warning ("unknown info state of %s",
pk_info_enum_to_string (pk_package_get_info (package)));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
