[gnome-software/wip/hughsie/GsAppQuirk] Add GsAppQuirk to avoid using types from libappstream-glib
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/hughsie/GsAppQuirk] Add GsAppQuirk to avoid using types from libappstream-glib
- Date: Mon, 15 Oct 2018 09:26:14 +0000 (UTC)
commit 8fe5566aa1ffc102e3b12f788a54b9271a3ae7dd
Author: Richard Hughes <richard hughsie com>
Date: Mon Oct 15 10:24:44 2018 +0100
Add GsAppQuirk to avoid using types from libappstream-glib
This also allows us to rename things to be more obvious, e.g. MATCH_ANY_PREFIX
to IS_WILDCARD. Longer term we want to disentangle appstream-glib further.
contrib/gs-plugin-example.c | 2 +-
doc/api/gnome-software-docs.xml | 4 +-
lib/gs-app-list.c | 6 +--
lib/gs-app.c | 56 +++++++++++-----------
lib/gs-app.h | 42 ++++++++++++++--
lib/gs-cmd.c | 2 +-
lib/gs-plugin-loader.c | 18 +++----
lib/gs-plugin-vfuncs.h | 2 +-
lib/gs-self-test.c | 6 +--
plugins/core/gs-appstream.c | 20 ++++----
plugins/core/gs-plugin-appstream.c | 4 +-
plugins/core/gs-plugin-generic-updates.c | 4 +-
plugins/core/gs-plugin-hardcoded-featured.c | 2 +-
plugins/core/gs-plugin-hardcoded-popular.c | 2 +-
plugins/core/gs-plugin-provenance-license.c | 2 +-
plugins/core/gs-plugin-provenance.c | 6 +--
plugins/core/gs-self-test.c | 6 +--
plugins/dummy/gs-plugin-dummy.c | 16 +++----
plugins/dummy/gs-self-test.c | 10 ++--
.../gs-plugin-fedora-pkgdb-collections.c | 6 +--
plugins/flatpak/gs-flatpak-utils.c | 4 +-
plugins/flatpak/gs-flatpak.c | 4 +-
plugins/fwupd/gs-fwupd-app.c | 8 ++--
plugins/fwupd/gs-plugin-fwupd.c | 6 +--
plugins/modalias/gs-plugin-modalias.c | 2 +-
plugins/packagekit/gs-plugin-packagekit-local.c | 4 +-
plugins/packagekit/gs-plugin-packagekit-offline.c | 2 +-
.../packagekit/gs-plugin-packagekit-refine-repos.c | 2 +-
plugins/packagekit/gs-plugin-packagekit-refine.c | 10 ++--
plugins/packagekit/gs-plugin-packagekit.c | 2 +-
plugins/packagekit/gs-plugin-systemd-updates.c | 2 +-
plugins/rpm-ostree/gs-plugin-rpm-ostree.c | 10 ++--
.../shell-extensions/gs-plugin-shell-extensions.c | 2 +-
plugins/snap/gs-plugin-snap.c | 8 ++--
src/gs-app-row.c | 6 +--
src/gs-details-page.c | 18 +++----
src/gs-installed-page.c | 6 +--
src/gs-moderate-page.c | 2 +-
src/gs-page.c | 4 +-
src/gs-update-monitor.c | 2 +-
src/gs-updates-section.c | 2 +-
41 files changed, 179 insertions(+), 143 deletions(-)
---
diff --git a/contrib/gs-plugin-example.c b/contrib/gs-plugin-example.c
index aef62a6b..4406b3af 100644
--- a/contrib/gs-plugin-example.c
+++ b/contrib/gs-plugin-example.c
@@ -47,7 +47,7 @@ gs_plugin_add_search (GsPlugin *plugin,
for (i = 0; values[i] != NULL; i++) {
if (g_strcmp0 (values[i], "fotoshop") == 0) {
g_autoptr(GsApp) app = gs_app_new ("gimp.desktop");
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_list_add (list, app);
}
}
diff --git a/doc/api/gnome-software-docs.xml b/doc/api/gnome-software-docs.xml
index 7ccf8085..b0847097 100644
--- a/doc/api/gnome-software-docs.xml
+++ b/doc/api/gnome-software-docs.xml
@@ -95,7 +95,7 @@ gs_plugin_add_search (GsPlugin *plugin,
for (i = 0; values[i] != NULL; i++) {
if (g_strcmp0 (values[i], "fotoshop") == 0) {
g_autoptr(GsApp) app = gs_app_new ("gimp.desktop");
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_list_add (list, app);
}
}
@@ -267,7 +267,7 @@ gs_plugin_add_installed (GsPlugin *plugin,
<para>
Setting the license means we don't get the non-free warning --
removing the 3rd party warning can be done using
- <code>AS_APP_QUIRK_PROVENANCE</code>
+ <code>GS_APP_QUIRK_PROVENANCE</code>
</para>
</listitem>
<listitem>
diff --git a/lib/gs-app-list.c b/lib/gs-app-list.c
index 9f3c16dc..2a1aeb9c 100644
--- a/lib/gs-app-list.c
+++ b/lib/gs-app-list.c
@@ -305,10 +305,10 @@ gs_app_list_check_for_duplicate (GsAppList *list, GsApp *app)
const gchar *id_old = NULL;
/* adding a wildcard */
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX)) {
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD)) {
for (guint i = 0; i < list->array->len; i++) {
GsApp *app_tmp = g_ptr_array_index (list->array, i);
- if (!gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (!gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
continue;
if (g_strcmp0 (gs_app_get_unique_id (app_tmp),
gs_app_get_unique_id (app)) == 0) {
@@ -338,7 +338,7 @@ gs_app_list_check_for_duplicate (GsAppList *list, GsApp *app)
/* existing app is a wildcard */
id_old = gs_app_get_unique_id (app_old);
- if (gs_app_has_quirk (app_old, AS_APP_QUIRK_MATCH_ANY_PREFIX)) {
+ if (gs_app_has_quirk (app_old, GS_APP_QUIRK_IS_WILDCARD)) {
g_debug ("adding %s as %s is a wildcard", id, id_old);
return TRUE;
}
diff --git a/lib/gs-app.c b/lib/gs-app.c
index a3b0454d..38298a12 100644
--- a/lib/gs-app.c
+++ b/lib/gs-app.c
@@ -119,7 +119,7 @@ typedef struct
guint64 install_date;
guint64 kudos;
gboolean to_be_installed;
- AsAppQuirk quirk;
+ GsAppQuirk quirk;
gboolean license_is_free;
GsApp *runtime;
GFile *local_file;
@@ -223,29 +223,29 @@ gs_app_kv_printf (GString *str, const gchar *key, const gchar *fmt, ...)
}
static const gchar *
-_as_app_quirk_flag_to_string (AsAppQuirk quirk)
+_as_app_quirk_flag_to_string (GsAppQuirk quirk)
{
- if (quirk == AS_APP_QUIRK_PROVENANCE)
+ if (quirk == GS_APP_QUIRK_PROVENANCE)
return "provenance";
- if (quirk == AS_APP_QUIRK_COMPULSORY)
+ if (quirk == GS_APP_QUIRK_COMPULSORY)
return "compulsory";
- if (quirk == AS_APP_QUIRK_HAS_SOURCE)
+ if (quirk == GS_APP_QUIRK_HAS_SOURCE)
return "has-source";
- if (quirk == AS_APP_QUIRK_MATCH_ANY_PREFIX)
- return "match-any-prefix";
- if (quirk == AS_APP_QUIRK_NEEDS_REBOOT)
+ if (quirk == GS_APP_QUIRK_IS_WILDCARD)
+ return "is-wildcard";
+ if (quirk == GS_APP_QUIRK_NEEDS_REBOOT)
return "needs-reboot";
- if (quirk == AS_APP_QUIRK_NOT_REVIEWABLE)
+ if (quirk == GS_APP_QUIRK_NOT_REVIEWABLE)
return "not-reviewable";
- if (quirk == AS_APP_QUIRK_HAS_SHORTCUT)
+ if (quirk == GS_APP_QUIRK_HAS_SHORTCUT)
return "has-shortcut";
- if (quirk == AS_APP_QUIRK_NOT_LAUNCHABLE)
+ if (quirk == GS_APP_QUIRK_NOT_LAUNCHABLE)
return "not-launchable";
- if (quirk == AS_APP_QUIRK_NEEDS_USER_ACTION)
+ if (quirk == GS_APP_QUIRK_NEEDS_USER_ACTION)
return "needs-user-action";
- if (quirk == AS_APP_QUIRK_IS_PROXY)
+ if (quirk == GS_APP_QUIRK_IS_PROXY)
return "is-proxy";
- if (quirk == AS_APP_QUIRK_REMOVABLE_HARDWARE)
+ if (quirk == GS_APP_QUIRK_REMOVABLE_HARDWARE)
return "removable-hardware";
return NULL;
}
@@ -309,27 +309,27 @@ gs_app_compare_priority (GsApp *app1, GsApp *app2)
}
/**
- * _as_app_quirk_to_string:
- * @quirk: a #AsAppQuirk
+ * gs_app_quirk_to_string:
+ * @quirk: a #GsAppQuirk
*
* Returns the quirk bitfield as a string.
*
* Returns: (transfer full): a string
**/
static gchar *
-_as_app_quirk_to_string (AsAppQuirk quirk)
+gs_app_quirk_to_string (GsAppQuirk quirk)
{
GString *str = g_string_new ("");
guint64 i;
/* nothing set */
- if (quirk == AS_APP_QUIRK_NONE) {
+ if (quirk == GS_APP_QUIRK_NONE) {
g_string_append (str, "none");
return g_string_free (str, FALSE);
}
/* get flags */
- for (i = 1; i < AS_APP_QUIRK_LAST; i *= 2) {
+ for (i = 1; i < GS_APP_QUIRK_LAST; i *= 2) {
if ((quirk & i) == 0)
continue;
g_string_append_printf (str, "%s,",
@@ -431,7 +431,7 @@ gs_app_to_string_append (GsApp *app, GString *str)
gs_app_kv_lpad (str, "kind", as_app_kind_to_string (priv->kind));
gs_app_kv_lpad (str, "state", as_app_state_to_string (priv->state));
if (priv->quirk > 0) {
- g_autofree gchar *qstr = _as_app_quirk_to_string (priv->quirk);
+ g_autofree gchar *qstr = gs_app_quirk_to_string (priv->quirk);
gs_app_kv_lpad (str, "quirk", qstr);
}
if (priv->progress > 0)
@@ -2836,7 +2836,7 @@ gs_app_set_management_plugin (GsApp *app, const gchar *management_plugin)
locker = g_mutex_locker_new (&priv->mutex);
/* plugins cannot adopt wildcard packages */
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX)) {
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD)) {
g_warning ("plugins should not set the management plugin on "
"%s to %s -- create a new GsApp in refine()!",
gs_app_get_unique_id_unlocked (app),
@@ -3830,7 +3830,7 @@ gs_app_set_to_be_installed (GsApp *app, gboolean to_be_installed)
/**
* gs_app_has_quirk:
* @app: a #GsApp
- * @quirk: a #AsAppQuirk, e.g. %AS_APP_QUIRK_COMPULSORY
+ * @quirk: a #GsAppQuirk, e.g. %GS_APP_QUIRK_COMPULSORY
*
* Finds out if an application has a specific quirk.
*
@@ -3839,7 +3839,7 @@ gs_app_set_to_be_installed (GsApp *app, gboolean to_be_installed)
* Since: 3.22
**/
gboolean
-gs_app_has_quirk (GsApp *app, AsAppQuirk quirk)
+gs_app_has_quirk (GsApp *app, GsAppQuirk quirk)
{
GsAppPrivate *priv = gs_app_get_instance_private (app);
g_return_val_if_fail (GS_IS_APP (app), FALSE);
@@ -3850,14 +3850,14 @@ gs_app_has_quirk (GsApp *app, AsAppQuirk quirk)
/**
* gs_app_add_quirk:
* @app: a #GsApp
- * @quirk: a #AsAppQuirk, e.g. %AS_APP_QUIRK_COMPULSORY
+ * @quirk: a #GsAppQuirk, e.g. %GS_APP_QUIRK_COMPULSORY
*
* Adds a quirk to an application.
*
* Since: 3.22
**/
void
-gs_app_add_quirk (GsApp *app, AsAppQuirk quirk)
+gs_app_add_quirk (GsApp *app, GsAppQuirk quirk)
{
GsAppPrivate *priv = gs_app_get_instance_private (app);
g_autoptr(GMutexLocker) locker = NULL;
@@ -3875,14 +3875,14 @@ gs_app_add_quirk (GsApp *app, AsAppQuirk quirk)
/**
* gs_app_remove_quirk:
* @app: a #GsApp
- * @quirk: a #AsAppQuirk, e.g. %AS_APP_QUIRK_COMPULSORY
+ * @quirk: a #GsAppQuirk, e.g. %GS_APP_QUIRK_COMPULSORY
*
* Removes a quirk from an application.
*
* Since: 3.22
**/
void
-gs_app_remove_quirk (GsApp *app, AsAppQuirk quirk)
+gs_app_remove_quirk (GsApp *app, GsAppQuirk quirk)
{
GsAppPrivate *priv = gs_app_get_instance_private (app);
g_autoptr(GMutexLocker) locker = NULL;
@@ -4464,7 +4464,7 @@ gchar *
gs_app_get_origin_ui (GsApp *app)
{
/* use the distro name for official packages */
- if (gs_app_has_quirk (app, AS_APP_QUIRK_PROVENANCE)) {
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_PROVENANCE)) {
g_autoptr(GsOsRelease) os_release = gs_os_release_new (NULL);
if (os_release != NULL)
return g_strdup (gs_os_release_get_name (os_release));
diff --git a/lib/gs-app.h b/lib/gs-app.h
index 0b38c101..f07ed372 100644
--- a/lib/gs-app.h
+++ b/lib/gs-app.h
@@ -82,6 +82,42 @@ typedef enum {
GS_APP_KUDO_LAST
} GsAppKudo;
+/**
+ * GsAppQuirk:
+ * @GS_APP_QUIRK_NONE: No special attributes
+ * @GS_APP_QUIRK_PROVENANCE: Installed by OS vendor
+ * @GS_APP_QUIRK_COMPULSORY: Cannot be removed
+ * @GS_APP_QUIRK_HAS_SOURCE: Has a source to allow staying up-to-date
+ * @GS_APP_QUIRK_IS_WILDCARD: Matches applications from any plugin
+ * @GS_APP_QUIRK_NEEDS_REBOOT: A reboot is required after the action
+ * @GS_APP_QUIRK_NOT_REVIEWABLE: The app is not reviewable
+ * @GS_APP_QUIRK_HAS_SHORTCUT: The app has a shortcut in the system
+ * @GS_APP_QUIRK_NOT_LAUNCHABLE: The app is not launchable (run-able)
+ * @GS_APP_QUIRK_NEEDS_USER_ACTION: The component requires some kind of user action
+ * @GS_APP_QUIRK_IS_PROXY: Is a proxy app that operates on other applications
+ * @GS_APP_QUIRK_REMOVABLE_HARDWARE: The device is unusable whilst the action is performed
+ * @GS_APP_QUIRK_DEVELOPER_VERIFIED: The app developer has been verified
+ *
+ * The application attributes.
+ **/
+typedef enum {
+ GS_APP_QUIRK_NONE = 0, /* Since: 3.32 */
+ GS_APP_QUIRK_PROVENANCE = 1 << 0, /* Since: 3.32 */
+ GS_APP_QUIRK_COMPULSORY = 1 << 1, /* Since: 3.32 */
+ GS_APP_QUIRK_HAS_SOURCE = 1 << 2, /* Since: 3.32 */
+ GS_APP_QUIRK_IS_WILDCARD = 1 << 3, /* Since: 3.32 */
+ GS_APP_QUIRK_NEEDS_REBOOT = 1 << 4, /* Since: 3.32 */
+ GS_APP_QUIRK_NOT_REVIEWABLE = 1 << 5, /* Since: 3.32 */
+ GS_APP_QUIRK_HAS_SHORTCUT = 1 << 6, /* Since: 3.32 */
+ GS_APP_QUIRK_NOT_LAUNCHABLE = 1 << 7, /* Since: 3.32 */
+ GS_APP_QUIRK_NEEDS_USER_ACTION = 1 << 8, /* Since: 3.32 */
+ GS_APP_QUIRK_IS_PROXY = 1 << 9, /* Since: 3.32 */
+ GS_APP_QUIRK_REMOVABLE_HARDWARE = 1 << 10, /* Since: 3.32 */
+ GS_APP_QUIRK_DEVELOPER_VERIFIED = 1 << 11, /* Since: 3.32 */
+ /*< private >*/
+ GS_APP_QUIRK_LAST
+} GsAppQuirk;
+
#define GS_APP_INSTALL_DATE_UNSET 0
#define GS_APP_INSTALL_DATE_UNKNOWN 1 /* 1s past the epoch */
#define GS_APP_SIZE_UNKNOWABLE G_MAXUINT64
@@ -311,11 +347,11 @@ void gs_app_set_match_value (GsApp *app,
guint gs_app_get_match_value (GsApp *app);
gboolean gs_app_has_quirk (GsApp *app,
- AsAppQuirk quirk);
+ GsAppQuirk quirk);
void gs_app_add_quirk (GsApp *app,
- AsAppQuirk quirk);
+ GsAppQuirk quirk);
void gs_app_remove_quirk (GsApp *app,
- AsAppQuirk quirk);
+ GsAppQuirk quirk);
gboolean gs_app_is_installed (GsApp *app);
gboolean gs_app_is_updatable (GsApp *app);
gchar *gs_app_get_origin_ui (GsApp *app);
diff --git a/lib/gs-cmd.c b/lib/gs-cmd.c
index 9ad5430d..92ae7b68 100644
--- a/lib/gs-cmd.c
+++ b/lib/gs-cmd.c
@@ -437,7 +437,7 @@ main (int argc, char **argv)
}
} else if (argc == 3 && g_strcmp0 (argv[1], "get-alternates") == 0) {
app = gs_app_new (argv[2]);
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
for (i = 0; i < repeat; i++) {
g_autoptr(GsPluginJob) plugin_job = NULL;
if (list != NULL)
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index 307e206c..f5944cee 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -476,7 +476,7 @@ gs_plugin_loader_run_adopt (GsPluginLoader *plugin_loader, GsAppList *list)
GsApp *app = gs_app_list_index (list, j);
if (gs_app_get_management_plugin (app) != NULL)
continue;
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
continue;
gs_plugin_loader_action_start (plugin_loader, plugin, FALSE);
adopt_app_func (plugin, app);
@@ -492,7 +492,7 @@ gs_plugin_loader_run_adopt (GsPluginLoader *plugin_loader, GsAppList *list)
GsApp *app = gs_app_list_index (list, j);
if (gs_app_get_management_plugin (app) != NULL)
continue;
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
continue;
g_debug ("nothing adopted %s", gs_app_get_unique_id (app));
}
@@ -829,7 +829,7 @@ gs_plugin_loader_run_refine_filter (GsPluginLoaderHelper *helper,
app_list = gs_app_list_copy (list);
for (guint j = 0; j < gs_app_list_length (app_list); j++) {
GsApp *app = gs_app_list_index (app_list, j);
- if (!gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX)) {
+ if (!gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD)) {
helper->function_name = "gs_plugin_refine_app";
} else {
helper->function_name = "gs_plugin_refine_wildcard";
@@ -847,7 +847,7 @@ gs_plugin_loader_run_refine_filter (GsPluginLoaderHelper *helper,
static gboolean
gs_plugin_loader_app_is_non_wildcard (GsApp *app, gpointer user_data)
{
- return !gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ return !gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
}
static gboolean
@@ -1328,7 +1328,7 @@ gs_plugin_loader_filter_qt_for_gtk (GsApp *app, gpointer user_data)
static gboolean
gs_plugin_loader_app_is_non_compulsory (GsApp *app, gpointer user_data)
{
- return !gs_app_has_quirk (app, AS_APP_QUIRK_COMPULSORY);
+ return !gs_app_has_quirk (app, GS_APP_QUIRK_COMPULSORY);
}
static gboolean
@@ -3216,7 +3216,7 @@ gs_plugin_loader_process_thread_cb (GTask *task,
_gs_app_get_icon_by_kind (app, AS_ICON_KIND_CACHED) == NULL) {
g_autoptr(AsIcon) ic = as_icon_new ();
as_icon_set_kind (ic, AS_ICON_KIND_STOCK);
- if (gs_app_has_quirk (app, AS_APP_QUIRK_HAS_SOURCE))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_HAS_SOURCE))
as_icon_set_name (ic, "x-package-repository");
else
as_icon_set_name (ic, "application-x-executable");
@@ -3454,7 +3454,7 @@ gs_plugin_loader_job_process_async (GsPluginLoader *plugin_loader,
GsAppList *list = gs_plugin_job_get_list (plugin_job);
for (guint i = 0; apps[i] != NULL; i++) {
g_autoptr(GsApp) app = gs_app_new (apps[i]);
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_list_add (list, app);
}
gs_plugin_job_set_action (plugin_job, GS_PLUGIN_ACTION_REFINE);
@@ -3681,7 +3681,7 @@ gs_plugin_loader_app_create (GsPluginLoader *plugin_loader, const gchar *unique_
/* use the plugin loader to convert a wildcard app*/
app = gs_app_new (NULL);
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_set_from_unique_id (app, unique_id);
gs_app_list_add (list, app);
plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE, NULL);
@@ -3694,7 +3694,7 @@ gs_plugin_loader_app_create (GsPluginLoader *plugin_loader, const gchar *unique_
/* return the first returned app that's not a wildcard */
for (guint i = 0; i < gs_app_list_length (list); i++) {
GsApp *app_tmp = gs_app_list_index (list, i);
- if (!gs_app_has_quirk (app_tmp, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (!gs_app_has_quirk (app_tmp, GS_APP_QUIRK_IS_WILDCARD))
return g_object_ref (app_tmp);
}
diff --git a/lib/gs-plugin-vfuncs.h b/lib/gs-plugin-vfuncs.h
index 2dc8cdf5..011acdf4 100644
--- a/lib/gs-plugin-vfuncs.h
+++ b/lib/gs-plugin-vfuncs.h
@@ -681,7 +681,7 @@ gboolean gs_plugin_app_set_rating (GsPlugin *plugin,
* NOTE: Once the action is complete, the plugin must set the new state of @app
* to %AS_APP_STATE_INSTALLED or %AS_APP_STATE_UNKNOWN if not known.
*
- * If %AS_APP_QUIRK_IS_PROXY is set on the application then the actual #GsApp
+ * If %GS_APP_QUIRK_IS_PROXY is set on the application then the actual #GsApp
* set in @app will be the related application of the parent. Plugins do not
* need to manually iterate on the related list of applications.
*
diff --git a/lib/gs-self-test.c b/lib/gs-self-test.c
index b60e0491..bccec1ef 100644
--- a/lib/gs-self-test.c
+++ b/lib/gs-self-test.c
@@ -493,7 +493,7 @@ gs_plugin_func (void)
/* allow duplicating a wildcard */
list = gs_app_list_new ();
app = gs_app_new ("gimp.desktop");
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_list_add (list, app);
g_object_unref (app);
app = gs_app_new ("gimp.desktop");
@@ -506,11 +506,11 @@ gs_plugin_func (void)
/* allow duplicating a wildcard */
list = gs_app_list_new ();
app = gs_app_new ("gimp.desktop");
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_list_add (list, app);
g_object_unref (app);
app = gs_app_new ("gimp.desktop");
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_list_add (list, app);
g_object_unref (app);
g_assert_cmpint (gs_app_list_length (list), ==, 1);
diff --git a/plugins/core/gs-appstream.c b/plugins/core/gs-appstream.c
index 3efc679e..3fb8284f 100644
--- a/plugins/core/gs-appstream.c
+++ b/plugins/core/gs-appstream.c
@@ -33,14 +33,14 @@ gs_appstream_create_app (GsPlugin *plugin, AsApp *item, GError **error)
const gchar *unique_id = as_app_get_unique_id (item);
GsApp *app = gs_plugin_cache_lookup (plugin, unique_id);
- /* if the app we found has the "match-any-prefix" quirk and our item does
+ /* if the app we found has the "is-wildcard" quirk and our item does
* not, then we create a new one because ours will be "complete", and
* using the mentioned quirk will lead to a different behavior (e.g. it'll
* be refined using refine_wildcard, it won't allow a management plugin to
* be set, etc.) */
- if (app != NULL && gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX) &&
- !as_app_has_quirk (item, AS_APP_QUIRK_MATCH_ANY_PREFIX)) {
- g_debug ("Looking for %s, got %s but has 'match-any-prefix' quirk "
+ if (app != NULL && gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD) &&
+ !as_app_has_quirk (item, GS_APP_QUIRK_IS_WILDCARD)) {
+ g_debug ("Looking for %s, got %s but has 'is-wildcard' quirk "
"so we create a new one instead.",
unique_id, gs_app_get_unique_id (app));
g_clear_object (&app);
@@ -478,7 +478,7 @@ gs_appstream_refine_app (GsPlugin *plugin,
case AS_APP_KIND_OS_UPGRADE:
case AS_APP_KIND_RUNTIME:
case AS_APP_KIND_SOURCE:
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
break;
default:
break;
@@ -488,9 +488,9 @@ gs_appstream_refine_app (GsPlugin *plugin,
tmp = gs_app_get_metadata_item (app, "GnomeSoftware::quirks::not-launchable");
if (tmp != NULL) {
if (g_strcmp0 (tmp, "true") == 0)
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
else if (g_strcmp0 (tmp, "false") == 0)
- gs_app_remove_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_remove_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
}
/* set management plugin automatically */
@@ -923,7 +923,7 @@ gs_appstream_add_popular (GsPlugin *plugin,
if (!as_app_has_kudo (item, "GnomeSoftware::popular"))
continue;
app = gs_app_new (as_app_get_id (item));
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_list_add (list, app);
}
return TRUE;
@@ -1065,7 +1065,7 @@ gs_appstream_add_alternates (GsPlugin *plugin,
for (guint i = 0; i < ids->len; i++) {
const gchar *id = g_ptr_array_index (ids, i);
g_autoptr(GsApp) app2 = gs_app_new (id);
- gs_app_add_quirk (app2, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app2, GS_APP_QUIRK_IS_WILDCARD);
gs_app_list_add (list, app2);
}
return TRUE;
@@ -1087,7 +1087,7 @@ gs_appstream_add_featured (GsPlugin *plugin,
if (as_app_get_metadata_item (item, "GnomeSoftware::FeatureTile-css") == NULL)
continue;
app = gs_app_new (as_app_get_id (item));
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_list_add (list, app);
}
return TRUE;
diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c
index 88c55c55..c3eaf245 100644
--- a/plugins/core/gs-plugin-appstream.c
+++ b/plugins/core/gs-plugin-appstream.c
@@ -386,12 +386,12 @@ gs_plugin_appstream_set_compulsory_quirk (GsApp *app, AsApp *item)
/* if the value has a :, check the whole string */
if (g_strstr_len (tmp, -1, ":")) {
if (g_strcmp0 (current_desktop, tmp) == 0) {
- gs_app_add_quirk (app, AS_APP_QUIRK_COMPULSORY);
+ gs_app_add_quirk (app, GS_APP_QUIRK_COMPULSORY);
break;
}
/* otherwise check if any element matches this one */
} else if (g_strv_contains ((const gchar * const *) xdg_current_desktops, tmp)) {
- gs_app_add_quirk (app, AS_APP_QUIRK_COMPULSORY);
+ gs_app_add_quirk (app, GS_APP_QUIRK_COMPULSORY);
break;
}
}
diff --git a/plugins/core/gs-plugin-generic-updates.c b/plugins/core/gs-plugin-generic-updates.c
index 074ac1d8..9e92be60 100644
--- a/plugins/core/gs-plugin-generic-updates.c
+++ b/plugins/core/gs-plugin-generic-updates.c
@@ -62,7 +62,7 @@ gs_plugin_generic_updates_get_os_update (GsPlugin *plugin)
/* create new */
app = gs_app_new (id);
- gs_app_add_quirk (app, AS_APP_QUIRK_IS_PROXY);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_PROXY);
gs_app_set_management_plugin (app, "");
gs_app_set_kind (app, AS_APP_KIND_OS_UPDATE);
gs_app_set_state (app, AS_APP_STATE_UPDATABLE_LIVE);
@@ -104,7 +104,7 @@ gs_plugin_refine (GsPlugin *plugin,
/* do we have any packages left that are not apps? */
for (guint i = 0; i < gs_app_list_length (list); i++) {
GsApp *app_tmp = gs_app_list_index (list, i);
- if (gs_app_has_quirk (app_tmp, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (gs_app_has_quirk (app_tmp, GS_APP_QUIRK_IS_WILDCARD))
continue;
if (gs_plugin_generic_updates_merge_os_update (app_tmp))
gs_app_list_add (os_updates, app_tmp);
diff --git a/plugins/core/gs-plugin-hardcoded-featured.c b/plugins/core/gs-plugin-hardcoded-featured.c
index e491442e..babcdb6e 100644
--- a/plugins/core/gs-plugin-hardcoded-featured.c
+++ b/plugins/core/gs-plugin-hardcoded-featured.c
@@ -76,7 +76,7 @@ gs_plugin_add_featured (GsPlugin *plugin,
/* create new */
app = gs_app_new (myapps[i].id);
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_set_metadata (app, "GnomeSoftware::Creator",
gs_plugin_get_name (plugin));
gs_app_set_metadata (app, "GnomeSoftware::FeatureTile-css",
diff --git a/plugins/core/gs-plugin-hardcoded-popular.c b/plugins/core/gs-plugin-hardcoded-popular.c
index 97bca4ab..550f244f 100644
--- a/plugins/core/gs-plugin-hardcoded-popular.c
+++ b/plugins/core/gs-plugin-hardcoded-popular.c
@@ -67,7 +67,7 @@ gs_plugin_add_popular (GsPlugin *plugin,
/* create new */
app = gs_app_new (apps[i]);
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_set_metadata (app, "GnomeSoftware::Creator",
gs_plugin_get_name (plugin));
gs_app_list_add (list, app);
diff --git a/plugins/core/gs-plugin-provenance-license.c b/plugins/core/gs-plugin-provenance-license.c
index 0834b6af..7787643b 100644
--- a/plugins/core/gs-plugin-provenance-license.c
+++ b/plugins/core/gs-plugin-provenance-license.c
@@ -124,7 +124,7 @@ gs_plugin_refine_app (GsPlugin *plugin,
return TRUE;
/* no provenance */
- if (!gs_app_has_quirk (app, AS_APP_QUIRK_PROVENANCE))
+ if (!gs_app_has_quirk (app, GS_APP_QUIRK_PROVENANCE))
return TRUE;
/* nothing to search */
diff --git a/plugins/core/gs-plugin-provenance.c b/plugins/core/gs-plugin-provenance.c
index cdc65cf0..b8032191 100644
--- a/plugins/core/gs-plugin-provenance.c
+++ b/plugins/core/gs-plugin-provenance.c
@@ -96,7 +96,7 @@ gs_plugin_refine_app (GsPlugin *plugin,
/* not required */
if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_PROVENANCE) == 0)
return TRUE;
- if (gs_app_has_quirk (app, AS_APP_QUIRK_PROVENANCE))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_PROVENANCE))
return TRUE;
/* nothing to search */
@@ -107,7 +107,7 @@ gs_plugin_refine_app (GsPlugin *plugin,
/* simple case */
origin = gs_app_get_origin (app);
if (origin != NULL && gs_utils_strv_fnmatch (sources, origin)) {
- gs_app_add_quirk (app, AS_APP_QUIRK_PROVENANCE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
return TRUE;
}
@@ -121,7 +121,7 @@ gs_plugin_refine_app (GsPlugin *plugin,
if (g_str_has_prefix (origin + 1, "installed:"))
origin += 10;
if (gs_utils_strv_fnmatch (sources, origin + 1)) {
- gs_app_add_quirk (app, AS_APP_QUIRK_PROVENANCE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
return TRUE;
}
return TRUE;
diff --git a/plugins/core/gs-self-test.c b/plugins/core/gs-self-test.c
index c7724a54..37f08686 100644
--- a/plugins/core/gs-self-test.c
+++ b/plugins/core/gs-self-test.c
@@ -156,7 +156,7 @@ gs_plugins_core_generic_updates_func (GsPluginLoader *plugin_loader)
/* make sure the os update is valid */
g_assert_cmpstr (gs_app_get_id (os_update), ==, "org.gnome.Software.OsUpdate");
g_assert_cmpint (gs_app_get_kind (os_update), ==, AS_APP_KIND_OS_UPDATE);
- g_assert (gs_app_has_quirk (os_update, AS_APP_QUIRK_IS_PROXY));
+ g_assert (gs_app_has_quirk (os_update, GS_APP_QUIRK_IS_PROXY));
/* must have two related apps, the ones we added earlier */
related = gs_app_get_related (os_update);
@@ -165,7 +165,7 @@ gs_plugins_core_generic_updates_func (GsPluginLoader *plugin_loader)
/* another test to make sure that we don't get an OsUpdate item created for wildcard apps */
list_wildcard = gs_app_list_new ();
app_wildcard = gs_app_new ("nosuchapp.desktop");
- gs_app_add_quirk (app_wildcard, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app_wildcard, GS_APP_QUIRK_IS_WILDCARD);
gs_app_set_kind (app_wildcard, AS_APP_KIND_GENERIC);
gs_app_list_add (list_wildcard, app_wildcard);
plugin_job2 = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE,
@@ -181,7 +181,7 @@ gs_plugins_core_generic_updates_func (GsPluginLoader *plugin_loader)
for (guint i = 0; i < gs_app_list_length (list_wildcard); i++) {
GsApp *app_tmp = gs_app_list_index (list_wildcard, i);
g_assert_cmpint (gs_app_get_kind (app_tmp), !=, AS_APP_KIND_OS_UPDATE);
- g_assert (!gs_app_has_quirk (app_tmp, AS_APP_QUIRK_IS_PROXY));
+ g_assert (!gs_app_has_quirk (app_tmp, GS_APP_QUIRK_IS_PROXY));
}
}
diff --git a/plugins/dummy/gs-plugin-dummy.c b/plugins/dummy/gs-plugin-dummy.c
index 9db12879..003b398d 100644
--- a/plugins/dummy/gs-plugin-dummy.c
+++ b/plugins/dummy/gs-plugin-dummy.c
@@ -184,12 +184,12 @@ gs_plugin_dummy_poll_cb (gpointer user_data)
}
/* toggle this to animate the hide/show the 3rd party banner */
- if (!gs_app_has_quirk (app, AS_APP_QUIRK_PROVENANCE)) {
+ if (!gs_app_has_quirk (app, GS_APP_QUIRK_PROVENANCE)) {
g_debug ("about to make app distro-provided");
- gs_app_add_quirk (app, AS_APP_QUIRK_PROVENANCE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
} else {
g_debug ("about to make app 3rd party");
- gs_app_remove_quirk (app, AS_APP_QUIRK_PROVENANCE);
+ gs_app_remove_quirk (app, GS_APP_QUIRK_PROVENANCE);
}
/* continue polling */
@@ -431,7 +431,7 @@ gs_plugin_add_updates (GsPlugin *plugin,
gs_app_set_update_urgency (proxy, AS_URGENCY_KIND_HIGH);
gs_app_add_icon (proxy, ic);
gs_app_set_kind (proxy, AS_APP_KIND_DESKTOP);
- gs_app_add_quirk (proxy, AS_APP_QUIRK_IS_PROXY);
+ gs_app_add_quirk (proxy, GS_APP_QUIRK_IS_PROXY);
gs_app_set_state (proxy, AS_APP_STATE_UPDATABLE_LIVE);
gs_app_set_management_plugin (proxy, gs_plugin_get_name (plugin));
gs_app_list_add (list, proxy);
@@ -504,7 +504,7 @@ gs_plugin_add_popular (GsPlugin *plugin,
/* add wildcard */
app1 = gs_app_new ("zeus.desktop");
- gs_app_add_quirk (app1, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app1, GS_APP_QUIRK_IS_WILDCARD);
gs_app_set_metadata (app1, "GnomeSoftware::Creator",
gs_plugin_get_name (plugin));
gs_app_list_add (list, app1);
@@ -810,9 +810,9 @@ gs_plugin_add_distro_upgrades (GsPlugin *plugin,
"A major upgrade, with new features and added polish.");
gs_app_set_url (app, AS_URL_KIND_HOMEPAGE,
"https://fedoraproject.org/wiki/Releases/24/Schedule";);
- gs_app_add_quirk (app, AS_APP_QUIRK_NEEDS_REBOOT);
- gs_app_add_quirk (app, AS_APP_QUIRK_PROVENANCE);
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_REVIEWABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NEEDS_REBOOT);
+ gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_REVIEWABLE);
gs_app_set_version (app, "25");
gs_app_set_size_installed (app, 256 * 1024 * 1024);
gs_app_set_size_download (app, 1024 * 1024 * 1024);
diff --git a/plugins/dummy/gs-self-test.c b/plugins/dummy/gs-self-test.c
index cf76e7ca..f9101dc2 100644
--- a/plugins/dummy/gs-self-test.c
+++ b/plugins/dummy/gs-self-test.c
@@ -186,7 +186,7 @@ gs_plugins_dummy_metadata_quirks (GsPluginLoader *plugin_loader)
/* check the not-launchable quirk */
- g_assert (!gs_app_has_quirk(app, AS_APP_QUIRK_NOT_LAUNCHABLE));
+ g_assert (!gs_app_has_quirk(app, GS_APP_QUIRK_NOT_LAUNCHABLE));
gs_app_set_metadata (app, "GnomeSoftware::quirks::not-launchable", "true");
@@ -200,7 +200,7 @@ gs_plugins_dummy_metadata_quirks (GsPluginLoader *plugin_loader)
g_assert_no_error (error);
g_assert (ret);
- g_assert (gs_app_has_quirk(app, AS_APP_QUIRK_NOT_LAUNCHABLE));
+ g_assert (gs_app_has_quirk(app, GS_APP_QUIRK_NOT_LAUNCHABLE));
gs_app_set_metadata (app, "GnomeSoftware::quirks::not-launchable", NULL);
gs_app_set_metadata (app, "GnomeSoftware::quirks::not-launchable", "false");
@@ -215,7 +215,7 @@ gs_plugins_dummy_metadata_quirks (GsPluginLoader *plugin_loader)
g_assert_no_error (error);
g_assert (ret);
- g_assert (!gs_app_has_quirk(app, AS_APP_QUIRK_NOT_LAUNCHABLE));
+ g_assert (!gs_app_has_quirk(app, GS_APP_QUIRK_NOT_LAUNCHABLE));
}
static void
@@ -294,7 +294,7 @@ gs_plugins_dummy_updates_func (GsPluginLoader *plugin_loader)
/* get the virtual non-apps OS update */
app = gs_app_list_index (list, 1);
g_assert_cmpstr (gs_app_get_id (app), ==, "proxy.desktop");
- g_assert (gs_app_has_quirk (app, AS_APP_QUIRK_IS_PROXY));
+ g_assert (gs_app_has_quirk (app, GS_APP_QUIRK_IS_PROXY));
g_assert_cmpint (gs_app_get_state (app), ==, AS_APP_STATE_UPDATABLE_LIVE);
g_assert_cmpint (gs_app_list_length (gs_app_get_related (app)), ==, 2);
}
@@ -386,7 +386,7 @@ gs_plugins_dummy_installed_func (GsPluginLoader *plugin_loader)
g_assert (gs_app_get_pixbuf (app) != NULL);
/* check various bitfields */
- g_assert (gs_app_has_quirk (app, AS_APP_QUIRK_PROVENANCE));
+ g_assert (gs_app_has_quirk (app, GS_APP_QUIRK_PROVENANCE));
g_assert_cmpstr (gs_app_get_license (app), ==, "GPL-2.0+");
g_assert (gs_app_get_license_is_free (app));
diff --git a/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c
b/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c
index f45a2439..d3f516c2 100644
--- a/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c
+++ b/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c
@@ -310,9 +310,9 @@ _create_upgrade_from_info (GsPlugin *plugin, PkgdbItem *item)
gs_app_set_size_installed (app, 1024 * 1024 * 1024); /* estimate */
gs_app_set_size_download (app, 256 * 1024 * 1024); /* estimate */
gs_app_set_license (app, GS_APP_QUALITY_LOWEST, "LicenseRef-free");
- gs_app_add_quirk (app, AS_APP_QUIRK_NEEDS_REBOOT);
- gs_app_add_quirk (app, AS_APP_QUIRK_PROVENANCE);
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_REVIEWABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NEEDS_REBOOT);
+ gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_REVIEWABLE);
gs_app_add_icon (app, ic);
/* show a Fedora magazine article for the release */
diff --git a/plugins/flatpak/gs-flatpak-utils.c b/plugins/flatpak/gs-flatpak-utils.c
index 58544d26..e61894bd 100644
--- a/plugins/flatpak/gs-flatpak-utils.c
+++ b/plugins/flatpak/gs-flatpak-utils.c
@@ -79,7 +79,7 @@ gs_flatpak_app_new_from_remote (FlatpakRemote *xremote)
gs_app_set_kind (app, AS_APP_KIND_SOURCE);
gs_app_set_state (app, flatpak_remote_get_disabled (xremote) ?
AS_APP_STATE_AVAILABLE : AS_APP_STATE_INSTALLED);
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
gs_app_set_name (app, GS_APP_QUALITY_LOWEST,
flatpak_remote_get_name (xremote));
@@ -175,7 +175,7 @@ gs_flatpak_app_new_from_repo_file (GFile *file,
gs_flatpak_app_set_file_kind (app, GS_FLATPAK_APP_FILE_KIND_REPO);
gs_app_set_kind (app, AS_APP_KIND_SOURCE);
gs_app_set_state (app, AS_APP_STATE_AVAILABLE_LOCAL);
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
gs_app_set_name (app, GS_APP_QUALITY_NORMAL, repo_title);
gs_flatpak_app_set_repo_url (app, repo_url);
gs_app_set_origin_hostname (app, repo_url);
diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c
index ecbe1ed5..faabf721 100644
--- a/plugins/flatpak/gs-flatpak.c
+++ b/plugins/flatpak/gs-flatpak.c
@@ -2210,7 +2210,7 @@ gs_flatpak_file_to_app_bundle (GsFlatpak *self,
/* not quite true: this just means we can update this specific app */
if (flatpak_bundle_ref_get_origin (xref_bundle))
- gs_app_add_quirk (app, AS_APP_QUIRK_HAS_SOURCE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_HAS_SOURCE);
/* success */
return g_steal_pointer (&app);
@@ -2295,7 +2295,7 @@ gs_flatpak_file_to_app_ref (GsFlatpak *self,
gs_flatpak_set_metadata (self, app, FLATPAK_REF (xref));
return g_steal_pointer (&app);
}
- gs_app_add_quirk (app, AS_APP_QUIRK_HAS_SOURCE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_HAS_SOURCE);
gs_flatpak_app_set_file_kind (app, GS_FLATPAK_APP_FILE_KIND_REF);
gs_app_set_state (app, AS_APP_STATE_AVAILABLE_LOCAL);
gs_flatpak_set_metadata (self, app, FLATPAK_REF (xref));
diff --git a/plugins/fwupd/gs-fwupd-app.c b/plugins/fwupd/gs-fwupd-app.c
index 982e1951..da5c333c 100644
--- a/plugins/fwupd/gs-fwupd-app.c
+++ b/plugins/fwupd/gs-fwupd-app.c
@@ -81,11 +81,11 @@ gs_fwupd_app_set_from_device (GsApp *app, FwupdDevice *dev)
/* reboot required to apply update */
if (fwupd_device_has_flag (dev, FWUPD_DEVICE_FLAG_NEEDS_REBOOT))
- gs_app_add_quirk (app, AS_APP_QUIRK_NEEDS_REBOOT);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NEEDS_REBOOT);
/* is removable */
if (!fwupd_device_has_flag (dev, FWUPD_DEVICE_FLAG_INTERNAL))
- gs_app_add_quirk (app, AS_APP_QUIRK_REMOVABLE_HARDWARE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_REMOVABLE_HARDWARE);
guids = fwupd_device_get_guids (dev);
if (guids->len > 0) {
@@ -128,9 +128,9 @@ gs_fwupd_app_set_from_device (GsApp *app, FwupdDevice *dev)
/* needs action */
if (fwupd_device_has_flag (dev, FWUPD_DEVICE_FLAG_NEEDS_BOOTLOADER))
- gs_app_add_quirk (app, AS_APP_QUIRK_NEEDS_USER_ACTION);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NEEDS_USER_ACTION);
else
- gs_app_remove_quirk (app, AS_APP_QUIRK_NEEDS_USER_ACTION);
+ gs_app_remove_quirk (app, GS_APP_QUIRK_NEEDS_USER_ACTION);
}
void
diff --git a/plugins/fwupd/gs-plugin-fwupd.c b/plugins/fwupd/gs-plugin-fwupd.c
index 216cf2fd..8c5cfeec 100644
--- a/plugins/fwupd/gs-plugin-fwupd.c
+++ b/plugins/fwupd/gs-plugin-fwupd.c
@@ -283,7 +283,7 @@ gs_plugin_fwupd_new_app_from_device (GsPlugin *plugin, FwupdDevice *dev)
/* default stuff */
gs_app_set_kind (app, AS_APP_KIND_FIRMWARE);
gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_CABINET);
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
gs_app_set_management_plugin (app, "fwupd");
gs_app_add_category (app, "System");
gs_fwupd_app_set_device_id (app, fwupd_device_get_id (dev));
@@ -329,7 +329,7 @@ gs_plugin_fwupd_new_app_from_device_raw (GsPlugin *plugin, FwupdDevice *device)
gs_app_set_kind (app, AS_APP_KIND_FIRMWARE);
gs_app_set_scope (app, AS_APP_SCOPE_SYSTEM);
gs_app_set_state (app, AS_APP_STATE_INSTALLED);
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
gs_app_set_version (app, fwupd_device_get_version (device));
gs_app_set_name (app, GS_APP_QUALITY_LOWEST, fwupd_device_get_name (device));
gs_app_set_summary (app, GS_APP_QUALITY_LOWEST, fwupd_device_get_summary (device));
@@ -1032,7 +1032,7 @@ gs_plugin_add_sources (GsPlugin *plugin,
gs_app_set_scope (app, AS_APP_SCOPE_SYSTEM);
gs_app_set_state (app, fwupd_remote_get_enabled (remote) ?
AS_APP_STATE_INSTALLED : AS_APP_STATE_AVAILABLE);
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
gs_app_set_name (app, GS_APP_QUALITY_LOWEST,
fwupd_remote_get_title (remote));
#if FWUPD_CHECK_VERSION(1,0,7)
diff --git a/plugins/modalias/gs-plugin-modalias.c b/plugins/modalias/gs-plugin-modalias.c
index 09338a24..6ca36511 100644
--- a/plugins/modalias/gs-plugin-modalias.c
+++ b/plugins/modalias/gs-plugin-modalias.c
@@ -141,7 +141,7 @@ gs_plugin_refine_app (GsPlugin *plugin,
as_icon_set_kind (ic, AS_ICON_KIND_STOCK);
as_icon_set_name (ic, "emblem-system-symbolic");
gs_app_add_icon (app, ic);
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
break;
}
}
diff --git a/plugins/packagekit/gs-plugin-packagekit-local.c b/plugins/packagekit/gs-plugin-packagekit-local.c
index 63e3e7a9..f135289e 100644
--- a/plugins/packagekit/gs-plugin-packagekit-local.c
+++ b/plugins/packagekit/gs-plugin-packagekit-local.c
@@ -94,7 +94,7 @@ gs_plugin_packagekit_refresh_guess_app_id (GsPlugin *plugin,
for (j = 0; fns[j] != NULL; j++) {
if (g_str_has_prefix (fns[j], "/etc/yum.repos.d/") &&
g_str_has_suffix (fns[j], ".repo")) {
- gs_app_add_quirk (app, AS_APP_QUIRK_HAS_SOURCE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_HAS_SOURCE);
}
if (g_str_has_prefix (fns[j], "/usr/share/applications/") &&
g_str_has_suffix (fns[j], ".desktop")) {
@@ -120,7 +120,7 @@ add_quirks_from_package_name (GsApp *app, const gchar *package_name)
NULL };
if (g_strv_contains (packages_with_repos, package_name))
- gs_app_add_quirk (app, AS_APP_QUIRK_HAS_SOURCE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_HAS_SOURCE);
}
gboolean
diff --git a/plugins/packagekit/gs-plugin-packagekit-offline.c
b/plugins/packagekit/gs-plugin-packagekit-offline.c
index b4904f4d..2e07da96 100644
--- a/plugins/packagekit/gs-plugin-packagekit-offline.c
+++ b/plugins/packagekit/gs-plugin-packagekit-offline.c
@@ -154,7 +154,7 @@ gs_plugin_add_updates_historical (GsPlugin *plugin,
app = gs_app_new (NULL);
gs_app_set_from_unique_id (app, "*/*/*/*/system/*");
gs_app_set_management_plugin (app, "packagekit");
- gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
gs_app_set_state (app, AS_APP_STATE_UNKNOWN);
gs_app_set_kind (app, AS_APP_KIND_OS_UPGRADE);
gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
diff --git a/plugins/packagekit/gs-plugin-packagekit-refine-repos.c
b/plugins/packagekit/gs-plugin-packagekit-refine-repos.c
index 22f32553..3a78d5cf 100644
--- a/plugins/packagekit/gs-plugin-packagekit-refine-repos.c
+++ b/plugins/packagekit/gs-plugin-packagekit-refine-repos.c
@@ -107,7 +107,7 @@ gs_plugin_refine (GsPlugin *plugin,
for (guint i = 0; i < gs_app_list_length (list); i++) {
GsApp *app = gs_app_list_index (list, i);
const gchar *fn;
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
continue;
if (gs_app_get_kind (app) != AS_APP_KIND_SOURCE)
continue;
diff --git a/plugins/packagekit/gs-plugin-packagekit-refine.c
b/plugins/packagekit/gs-plugin-packagekit-refine.c
index 673c5425..920ebb58 100644
--- a/plugins/packagekit/gs-plugin-packagekit-refine.c
+++ b/plugins/packagekit/gs-plugin-packagekit-refine.c
@@ -415,7 +415,7 @@ gs_plugin_packagekit_refine_update_urgency (GsPlugin *plugin,
for (i = 0; i < gs_app_list_length (list); i++) {
g_autoptr (PkPackage) pkg = NULL;
app = gs_app_list_index (list, i);
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
continue;
package_id = gs_app_get_source_id_default (app);
if (package_id == NULL)
@@ -480,7 +480,7 @@ gs_plugin_packagekit_refine_details (GsPlugin *plugin,
list_tmp = gs_app_list_new ();
for (guint i = 0; i < gs_app_list_length (list); i++) {
GsApp *app = gs_app_list_index (list, i);
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
continue;
if (gs_app_get_kind (app) == AS_APP_KIND_WEB_APP)
continue;
@@ -628,7 +628,7 @@ gs_plugin_packagekit_refine_name_to_id (GsPlugin *plugin,
GPtrArray *sources;
GsApp *app = gs_app_list_index (list, i);
const gchar *tmp;
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
continue;
if (gs_app_get_kind (app) == AS_APP_KIND_WEB_APP)
continue;
@@ -673,7 +673,7 @@ gs_plugin_packagekit_refine_filename_to_id (GsPlugin *plugin,
g_autofree gchar *fn = NULL;
GsApp *app = gs_app_list_index (list, i);
const gchar *tmp;
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
continue;
if (gs_app_get_source_id_default (app) != NULL)
continue;
@@ -724,7 +724,7 @@ gs_plugin_packagekit_refine_update_details (GsPlugin *plugin,
for (guint i = 0; i < gs_app_list_length (list); i++) {
GsApp *app = gs_app_list_index (list, i);
const gchar *tmp;
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
continue;
if (gs_app_get_state (app) != AS_APP_STATE_UPDATABLE)
continue;
diff --git a/plugins/packagekit/gs-plugin-packagekit.c b/plugins/packagekit/gs-plugin-packagekit.c
index e452142a..096fbd0d 100644
--- a/plugins/packagekit/gs-plugin-packagekit.c
+++ b/plugins/packagekit/gs-plugin-packagekit.c
@@ -158,7 +158,7 @@ gs_plugin_add_sources (GsPlugin *plugin,
gs_app_set_management_plugin (app, gs_plugin_get_name (plugin));
gs_app_set_kind (app, AS_APP_KIND_SOURCE);
gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
gs_app_set_state (app, pk_repo_detail_get_enabled (rd) ?
AS_APP_STATE_INSTALLED : AS_APP_STATE_AVAILABLE);
gs_app_set_name (app,
diff --git a/plugins/packagekit/gs-plugin-systemd-updates.c b/plugins/packagekit/gs-plugin-systemd-updates.c
index 449a9726..e423b75b 100644
--- a/plugins/packagekit/gs-plugin-systemd-updates.c
+++ b/plugins/packagekit/gs-plugin-systemd-updates.c
@@ -259,7 +259,7 @@ gs_plugin_update (GsPlugin *plugin,
GsAppList *related = gs_app_get_related (app);
/* not a proxy, which is somewhat odd... */
- if (!gs_app_has_quirk (app, AS_APP_QUIRK_IS_PROXY))
+ if (!gs_app_has_quirk (app, GS_APP_QUIRK_IS_PROXY))
return _systemd_trigger_app (plugin, app, cancellable, error);
/* try to trigger each related app */
diff --git a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
index fd2a9206..cc5bc3ae 100644
--- a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
+++ b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
@@ -337,7 +337,7 @@ app_from_modified_pkg_variant (GsPlugin *plugin, GVariant *variant)
/* create new app */
app = gs_app_new (NULL);
- gs_app_add_quirk (app, AS_APP_QUIRK_NEEDS_REBOOT);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NEEDS_REBOOT);
gs_app_set_management_plugin (app, "rpm-ostree");
gs_app_set_size_download (app, 0);
gs_app_set_kind (app, AS_APP_KIND_GENERIC);
@@ -375,7 +375,7 @@ app_from_single_pkg_variant (GsPlugin *plugin, GVariant *variant, gboolean addit
/* create new app */
app = gs_app_new (NULL);
- gs_app_add_quirk (app, AS_APP_QUIRK_NEEDS_REBOOT);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NEEDS_REBOOT);
gs_app_set_management_plugin (app, "rpm-ostree");
gs_app_set_size_download (app, 0);
gs_app_set_kind (app, AS_APP_KIND_GENERIC);
@@ -677,7 +677,7 @@ gs_plugin_update_app (GsPlugin *plugin,
GsAppList *related = gs_app_get_related (app);
/* we don't currently don't put all updates in the OsUpdate proxy app */
- if (!gs_app_has_quirk (app, AS_APP_QUIRK_IS_PROXY))
+ if (!gs_app_has_quirk (app, GS_APP_QUIRK_IS_PROXY))
return trigger_rpmostree_update (plugin, app, cancellable, error);
/* try to trigger each related app */
@@ -764,7 +764,7 @@ resolve_packages_app (GsPlugin *plugin,
if (!g_strv_contains ((const gchar * const *) layered_packages,
rpm_ostree_package_get_name (pkg))) {
/* on rpm-ostree this package cannot be removed 'live' */
- gs_app_add_quirk (app, AS_APP_QUIRK_COMPULSORY);
+ gs_app_add_quirk (app, GS_APP_QUIRK_COMPULSORY);
}
}
}
@@ -803,7 +803,7 @@ gs_plugin_refine (GsPlugin *plugin,
for (guint i = 0; i < gs_app_list_length (list); i++) {
GsApp *app = gs_app_list_index (list, i);
GPtrArray *sources;
- if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
continue;
if (gs_app_get_kind (app) == AS_APP_KIND_WEB_APP)
continue;
diff --git a/plugins/shell-extensions/gs-plugin-shell-extensions.c
b/plugins/shell-extensions/gs-plugin-shell-extensions.c
index 28259adb..5bf2ee71 100644
--- a/plugins/shell-extensions/gs-plugin-shell-extensions.c
+++ b/plugins/shell-extensions/gs-plugin-shell-extensions.c
@@ -387,7 +387,7 @@ gs_plugin_add_sources (GsPlugin *plugin,
gs_app_set_state (app, AS_APP_STATE_INSTALLED);
else
gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
gs_app_set_name (app, GS_APP_QUALITY_LOWEST,
_("GNOME Shell Extensions Repository"));
gs_app_set_url (app, AS_URL_KIND_HOMEPAGE,
diff --git a/plugins/snap/gs-plugin-snap.c b/plugins/snap/gs-plugin-snap.c
index 1ee9937b..739fbe4d 100644
--- a/plugins/snap/gs-plugin-snap.c
+++ b/plugins/snap/gs-plugin-snap.c
@@ -313,9 +313,9 @@ snap_to_app (GsPlugin *plugin, SnapdSnap *snap)
gs_app_set_management_plugin (app, "snap");
if (gs_app_get_kind (app) != AS_APP_KIND_DESKTOP)
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
if (gs_plugin_check_distro_id (plugin, "ubuntu"))
- gs_app_add_quirk (app, AS_APP_QUIRK_PROVENANCE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
confinement = snapd_snap_get_confinement (snap);
if (confinement != SNAPD_CONFINEMENT_UNKNOWN) {
@@ -825,7 +825,7 @@ gs_plugin_refine_app (GsPlugin *plugin,
developer_name = snapd_snap_get_publisher_username (snap);
gs_app_set_developer_name (app, developer_name);
if (snapd_snap_get_publisher_validation (snap) == SNAPD_PUBLISHER_VALIDATION_VERIFIED)
- gs_app_add_quirk (app, AS_APP_QUIRK_DEVELOPER_VERIFIED);
+ gs_app_add_quirk (app, GS_APP_QUIRK_DEVELOPER_VERIFIED);
snap = local_snap != NULL ? local_snap : store_snap;
gs_app_set_version (app, snapd_snap_get_version (snap));
@@ -844,7 +844,7 @@ gs_plugin_refine_app (GsPlugin *plugin,
gs_app_set_metadata (app, "snap::launch-name", snapd_app_get_name (snap_app));
gs_app_set_metadata (app, "snap::launch-desktop", snapd_app_get_desktop_file
(snap_app));
} else {
- gs_app_add_quirk (app, AS_APP_QUIRK_NOT_LAUNCHABLE);
+ gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
}
}
diff --git a/src/gs-app-row.c b/src/gs-app-row.c
index 3af5a09d..cb168655 100644
--- a/src/gs-app-row.c
+++ b/src/gs-app-row.c
@@ -172,7 +172,7 @@ gs_app_row_refresh_button (GsAppRow *app_row, gboolean missing_search_result)
break;
case AS_APP_STATE_UPDATABLE:
case AS_APP_STATE_INSTALLED:
- if (!gs_app_has_quirk (priv->app, AS_APP_QUIRK_COMPULSORY))
+ if (!gs_app_has_quirk (priv->app, GS_APP_QUIRK_COMPULSORY))
gtk_widget_set_visible (priv->button, TRUE);
/* TRANSLATORS: this is a button next to the search results that
* allows the application to be easily removed */
@@ -209,7 +209,7 @@ gs_app_row_refresh_button (GsAppRow *app_row, gboolean missing_search_result)
case AS_APP_STATE_INSTALLED:
gtk_widget_set_visible (priv->button,
!gs_app_has_quirk (priv->app,
- AS_APP_QUIRK_COMPULSORY));
+ GS_APP_QUIRK_COMPULSORY));
break;
default:
gtk_widget_set_visible (priv->button, FALSE);
@@ -289,7 +289,7 @@ gs_app_row_refresh (GsAppRow *app_row)
}
/* add warning */
- if (gs_app_has_quirk (priv->app, AS_APP_QUIRK_REMOVABLE_HARDWARE)) {
+ if (gs_app_has_quirk (priv->app, GS_APP_QUIRK_REMOVABLE_HARDWARE)) {
gtk_label_set_text (GTK_LABEL (priv->label_warning),
/* TRANSLATORS: during the update the device
* will restart into a special update-only mode */
diff --git a/src/gs-details-page.c b/src/gs-details-page.c
index 7917f358..d3cf8078 100644
--- a/src/gs-details-page.c
+++ b/src/gs-details-page.c
@@ -222,7 +222,7 @@ gs_details_page_update_shortcut_button (GsDetailsPage *self)
gs_plugin_loader_get_plugin_supported (self->plugin_loader,
"gs_plugin_remove_shortcut");
- has_shortcut = gs_app_has_quirk (self->app, AS_APP_QUIRK_HAS_SHORTCUT);
+ has_shortcut = gs_app_has_quirk (self->app, GS_APP_QUIRK_HAS_SHORTCUT);
if (add_shortcut_func) {
gtk_widget_set_visible (self->button_details_add_shortcut,
@@ -872,7 +872,7 @@ gs_details_page_refresh_buttons (GsDetailsPage *self)
case AS_APP_STATE_INSTALLED:
case AS_APP_STATE_UPDATABLE:
case AS_APP_STATE_UPDATABLE_LIVE:
- if (!gs_app_has_quirk (self->app, AS_APP_QUIRK_NOT_LAUNCHABLE)) {
+ if (!gs_app_has_quirk (self->app, GS_APP_QUIRK_NOT_LAUNCHABLE)) {
gtk_widget_set_visible (self->button_details_launch, TRUE);
} else {
gtk_widget_set_visible (self->button_details_launch, FALSE);
@@ -901,7 +901,7 @@ gs_details_page_refresh_buttons (GsDetailsPage *self)
}
/* remove button */
- if (gs_app_has_quirk (self->app, AS_APP_QUIRK_COMPULSORY) ||
+ if (gs_app_has_quirk (self->app, GS_APP_QUIRK_COMPULSORY) ||
gs_app_get_kind (self->app) == AS_APP_KIND_FIRMWARE) {
gtk_widget_set_visible (self->button_remove, FALSE);
} else {
@@ -1023,7 +1023,7 @@ gs_details_page_refresh_all (GsDetailsPage *self)
gtk_label_set_label (GTK_LABEL (self->label_details_developer_value), tmp);
gtk_widget_set_visible (self->label_details_developer_value, TRUE);
}
- gtk_widget_set_visible (self->image_details_developer_verified, gs_app_has_quirk (self->app,
AS_APP_QUIRK_DEVELOPER_VERIFIED));
+ gtk_widget_set_visible (self->image_details_developer_verified, gs_app_has_quirk (self->app,
GS_APP_QUIRK_DEVELOPER_VERIFIED));
/* set the license buttons */
tmp = gs_app_get_license (self->app);
@@ -1154,7 +1154,7 @@ gs_details_page_refresh_all (GsDetailsPage *self)
/* are we trying to replace something in the baseos */
gtk_widget_set_visible (self->infobar_details_package_baseos,
- gs_app_has_quirk (self->app, AS_APP_QUIRK_COMPULSORY) &&
+ gs_app_has_quirk (self->app, GS_APP_QUIRK_COMPULSORY) &&
gs_app_get_state (self->app) == AS_APP_STATE_AVAILABLE_LOCAL);
switch (gs_app_get_kind (self->app)) {
@@ -1162,7 +1162,7 @@ gs_details_page_refresh_all (GsDetailsPage *self)
/* installing an app with a repo file */
gtk_widget_set_visible (self->infobar_details_app_repo,
gs_app_has_quirk (self->app,
- AS_APP_QUIRK_HAS_SOURCE) &&
+ GS_APP_QUIRK_HAS_SOURCE) &&
gs_app_get_state (self->app) == AS_APP_STATE_AVAILABLE_LOCAL);
gtk_widget_set_visible (self->infobar_details_repo, FALSE);
break;
@@ -1171,7 +1171,7 @@ gs_details_page_refresh_all (GsDetailsPage *self)
gtk_widget_set_visible (self->infobar_details_app_repo, FALSE);
gtk_widget_set_visible (self->infobar_details_repo,
gs_app_has_quirk (self->app,
- AS_APP_QUIRK_HAS_SOURCE) &&
+ GS_APP_QUIRK_HAS_SOURCE) &&
gs_app_get_state (self->app) == AS_APP_STATE_AVAILABLE_LOCAL);
break;
default:
@@ -1188,7 +1188,7 @@ gs_details_page_refresh_all (GsDetailsPage *self)
} else {
gtk_widget_set_visible (self->infobar_details_app_norepo,
!gs_app_has_quirk (self->app,
- AS_APP_QUIRK_HAS_SOURCE) &&
+ GS_APP_QUIRK_HAS_SOURCE) &&
gs_app_get_state (self->app) == AS_APP_STATE_AVAILABLE_LOCAL);
}
break;
@@ -1415,7 +1415,7 @@ gs_details_page_refresh_reviews (GsDetailsPage *self)
}
/* some apps are unreviewable */
- if (gs_app_has_quirk (self->app, AS_APP_QUIRK_NOT_REVIEWABLE))
+ if (gs_app_has_quirk (self->app, GS_APP_QUIRK_NOT_REVIEWABLE))
show_reviews = FALSE;
/* set the star rating */
diff --git a/src/gs-installed-page.c b/src/gs-installed-page.c
index 38b2e9bd..c35aa2cf 100644
--- a/src/gs-installed-page.c
+++ b/src/gs-installed-page.c
@@ -204,7 +204,7 @@ gs_installed_page_add_app (GsInstalledPage *self, GsAppList *list, GsApp *app)
self->sizegroup_desc,
self->sizegroup_button);
- if (!gs_app_has_quirk (app, AS_APP_QUIRK_COMPULSORY)) {
+ if (!gs_app_has_quirk (app, GS_APP_QUIRK_COMPULSORY)) {
gs_app_row_set_show_installed_size (GS_APP_ROW (app_row),
should_show_installed_size (self));
}
@@ -421,7 +421,7 @@ gs_installed_page_get_app_sort_key (GsApp *app)
}
/* sort normal, compulsory */
- if (!gs_app_has_quirk (app, AS_APP_QUIRK_COMPULSORY))
+ if (!gs_app_has_quirk (app, GS_APP_QUIRK_COMPULSORY))
g_string_append (key, "1:");
else
g_string_append (key, "2:");
@@ -470,7 +470,7 @@ gs_installed_page_get_app_section (GsApp *app)
{
if (gs_app_get_kind (app) == AS_APP_KIND_DESKTOP ||
gs_app_get_kind (app) == AS_APP_KIND_WEB_APP) {
- if (gs_app_has_quirk (app, AS_APP_QUIRK_COMPULSORY))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_COMPULSORY))
return GS_UPDATE_LIST_SECTION_SYSTEM_APPS;
return GS_UPDATE_LIST_SECTION_REMOVABLE_APPS;
}
diff --git a/src/gs-moderate-page.c b/src/gs-moderate-page.c
index aa3e283d..c6e27191 100644
--- a/src/gs-moderate-page.c
+++ b/src/gs-moderate-page.c
@@ -138,7 +138,7 @@ gs_moderate_page_add_app (GsModeratePage *self, GsApp *app)
guint i;
/* this hides the action button */
- gs_app_add_quirk (app, AS_APP_QUIRK_COMPULSORY);
+ gs_app_add_quirk (app, GS_APP_QUIRK_COMPULSORY);
/* add top level app */
app_row = gs_app_row_new (app);
diff --git a/src/gs-page.c b/src/gs-page.c
index 4880477c..aa5321ec 100644
--- a/src/gs-page.c
+++ b/src/gs-page.c
@@ -565,7 +565,7 @@ gs_page_notify_quirk_cb (GsApp *app, GParamSpec *pspec, GsPageHelper *helper)
{
gtk_widget_set_sensitive (helper->button_install,
!gs_app_has_quirk (helper->app,
- AS_APP_QUIRK_NEEDS_USER_ACTION));
+ GS_APP_QUIRK_NEEDS_USER_ACTION));
}
static void
@@ -637,7 +637,7 @@ gs_page_update_app (GsPage *page, GsApp *app, GCancellable *cancellable)
/* tell the user what they have to do */
if (gs_app_get_kind (app) == AS_APP_KIND_FIRMWARE &&
- gs_app_has_quirk (app, AS_APP_QUIRK_NEEDS_USER_ACTION)) {
+ gs_app_has_quirk (app, GS_APP_QUIRK_NEEDS_USER_ACTION)) {
GPtrArray *screenshots = gs_app_get_screenshots (app);
if (screenshots->len > 0) {
AsScreenshot *ss = g_ptr_array_index (screenshots, 0);
diff --git a/src/gs-update-monitor.c b/src/gs-update-monitor.c
index 5703dd9c..b9350780 100644
--- a/src/gs-update-monitor.c
+++ b/src/gs-update-monitor.c
@@ -213,7 +213,7 @@ _build_autoupdated_notification (GsUpdateMonitor *monitor, GsAppList *list)
/* how many apps needs updating */
for (guint i = 0; i < gs_app_list_length (list_apps); i++) {
GsApp *app = gs_app_list_index (list_apps, i);
- if (gs_app_has_quirk (app, AS_APP_QUIRK_NEEDS_REBOOT))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_NEEDS_REBOOT))
need_restart_cnt++;
}
diff --git a/src/gs-updates-section.c b/src/gs-updates-section.c
index a158ded9..4b3a66de 100644
--- a/src/gs-updates-section.c
+++ b/src/gs-updates-section.c
@@ -359,7 +359,7 @@ _button_update_all_clicked_cb (GtkButton *button, GsUpdatesSection *self)
GsApp *app = gs_app_list_index (sorted_list, i);
if (gs_app_get_state (app) == AS_APP_STATE_UPDATABLE)
helper->do_reboot = TRUE;
- if (gs_app_has_quirk (app, AS_APP_QUIRK_NEEDS_REBOOT))
+ if (gs_app_has_quirk (app, GS_APP_QUIRK_NEEDS_REBOOT))
helper->do_reboot_notification = TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
