diff options
| author | Richard Hughes <richard@hughsie.com> | 2016-08-05 10:54:52 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2016-08-05 10:54:52 +0100 |
| commit | b0a80677550c1af4f7b3cbd679078ed697b40b37 (patch) | |
| tree | 42418ae373c3171db98c7ba30364a9e80a6cf5d5 | |
| parent | e060e8c4b5c0a568f17386a4d401d384abf48633 (diff) | |
| download | appstream-glib-b0a80677550c1af4f7b3cbd679078ed697b40b37.tar.gz | |
trivial: Use the existing quirk as it can be made useful again
| -rw-r--r-- | libappstream-glib/as-app.c | 2 | ||||
| -rw-r--r-- | libappstream-glib/as-app.h | 2 | ||||
| -rw-r--r-- | libappstream-glib/as-store.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/libappstream-glib/as-app.c b/libappstream-glib/as-app.c index bdcbcf6..3af6046 100644 --- a/libappstream-glib/as-app.c +++ b/libappstream-glib/as-app.c @@ -605,7 +605,7 @@ as_app_get_unique_id (AsApp *app) { AsAppPrivate *priv = GET_PRIVATE (app); if (priv->unique_id == NULL) { - if (as_app_has_quirk (app, AS_APP_QUIRK_METADATA_MERGE)) { + if (as_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX)) { priv->unique_id = as_utils_unique_id_build (AS_APP_SCOPE_UNKNOWN, AS_BUNDLE_KIND_UNKNOWN, NULL, diff --git a/libappstream-glib/as-app.h b/libappstream-glib/as-app.h index 59490bb..4a47c32 100644 --- a/libappstream-glib/as-app.h +++ b/libappstream-glib/as-app.h @@ -224,7 +224,6 @@ typedef enum { * @AS_APP_QUIRK_NOT_REVIEWABLE: The app is not reviewable * @AS_APP_QUIRK_HAS_SHORTCUT: The app has a shortcut in the system * @AS_APP_QUIRK_NOT_LAUNCHABLE: The app is not launchable (run-able) - * @AS_APP_QUIRK_METADATA_MERGE: The metadata should be merged with existing apps * * The component attributes. **/ @@ -238,7 +237,6 @@ typedef enum { AS_APP_QUIRK_NOT_REVIEWABLE = 1 << 5, /* Since: 0.5.14 */ AS_APP_QUIRK_HAS_SHORTCUT = 1 << 6, /* Since: 0.5.15 */ AS_APP_QUIRK_NOT_LAUNCHABLE = 1 << 7, /* Since: 0.5.15 */ - AS_APP_QUIRK_METADATA_MERGE = 1 << 8, /* Since: 0.6.1 */ /*< private >*/ AS_APP_QUIRK_LAST } AsAppQuirk; diff --git a/libappstream-glib/as-store.c b/libappstream-glib/as-store.c index 08c522b..a1909c4 100644 --- a/libappstream-glib/as-store.c +++ b/libappstream-glib/as-store.c @@ -929,11 +929,11 @@ as_store_add_app (AsStore *store, AsApp *app) /* use some hacky logic to support older files */ if ((priv->add_flags & AS_STORE_ADD_FLAG_USE_MERGE_HEURISTIC) > 0 && _as_app_is_perhaps_merge_component (app)) { - as_app_add_quirk (app, AS_APP_QUIRK_METADATA_MERGE); + as_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX); } /* this is a special merge component */ - if (as_app_has_quirk (app, AS_APP_QUIRK_METADATA_MERGE)) { + if (as_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX)) { apps = g_hash_table_lookup (priv->hash_merge_id, id); if (apps == NULL) { apps = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); |