diff options
| author | Richard Hughes <richard@hughsie.com> | 2016-02-26 08:17:33 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2016-02-26 08:17:50 +0000 |
| commit | b7fe421f6ab63418e14685934ce4b115211d8e32 (patch) | |
| tree | a095b372e17d958492bfa8279e23e2bd50d88be6 | |
| parent | f98bd6c5aa28d6d8c416f2694675d3b5caa03105 (diff) | |
| download | appstream-glib-b7fe421f6ab63418e14685934ce4b115211d8e32.tar.gz | |
Add AS_APP_KIND_OS_UPDATE
Also, namespace the OS upgrade kind to be the same.
| -rw-r--r-- | client/as-util.c | 3 | ||||
| -rw-r--r-- | libappstream-glib/as-app.c | 12 | ||||
| -rw-r--r-- | libappstream-glib/as-app.h | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/client/as-util.c b/client/as-util.c index 5a255b9..e88e6d6 100644 --- a/client/as-util.c +++ b/client/as-util.c @@ -2814,7 +2814,8 @@ as_util_check_root_app_icon (AsApp *app, GError **error) case AS_APP_KIND_CODEC: case AS_APP_KIND_RUNTIME: case AS_APP_KIND_GENERIC: - case AS_APP_KIND_DISTRO_UPGRADE: + case AS_APP_KIND_OS_UPDATE: + case AS_APP_KIND_OS_UPGRADE: return TRUE; default: break; diff --git a/libappstream-glib/as-app.c b/libappstream-glib/as-app.c index dc36750..e51da39 100644 --- a/libappstream-glib/as-app.c +++ b/libappstream-glib/as-app.c @@ -158,8 +158,10 @@ as_app_kind_to_string (AsAppKind kind) return "runtime"; if (kind == AS_APP_KIND_GENERIC) return "generic"; - if (kind == AS_APP_KIND_DISTRO_UPGRADE) - return "distro-upgrade"; + if (kind == AS_APP_KIND_OS_UPDATE) + return "os-update"; + if (kind == AS_APP_KIND_OS_UPGRADE) + return "os-upgrade"; if (kind == AS_APP_KIND_SHELL_EXTENSION) return "shell-extension"; return "unknown"; @@ -198,8 +200,10 @@ as_app_kind_from_string (const gchar *kind) return AS_APP_KIND_RUNTIME; if (g_strcmp0 (kind, "generic") == 0) return AS_APP_KIND_GENERIC; - if (g_strcmp0 (kind, "distro-upgrade") == 0) - return AS_APP_KIND_DISTRO_UPGRADE; + if (g_strcmp0 (kind, "os-update") == 0) + return AS_APP_KIND_OS_UPDATE; + if (g_strcmp0 (kind, "os-upgrade") == 0) + return AS_APP_KIND_OS_UPGRADE; if (g_strcmp0 (kind, "shell-extension") == 0) return AS_APP_KIND_SHELL_EXTENSION; return AS_APP_KIND_UNKNOWN; diff --git a/libappstream-glib/as-app.h b/libappstream-glib/as-app.h index cbdf083..3ce1d01 100644 --- a/libappstream-glib/as-app.h +++ b/libappstream-glib/as-app.h @@ -182,7 +182,8 @@ typedef enum { * @AS_APP_KIND_FIRMWARE: A firmware update * @AS_APP_KIND_RUNTIME: Runtime platform * @AS_APP_KIND_GENERIC: Generic component - * @AS_APP_KIND_DISTRO_UPGRADE: Distribution upgrade + * @AS_APP_KIND_OS_UPDATE: Operating system update + * @AS_APP_KIND_OS_UPGRADE: Operating system upgrade * @AS_APP_KIND_SHELL_EXTENSION: GNOME Shell extension * * The component type. @@ -199,7 +200,8 @@ typedef enum { AS_APP_KIND_FIRMWARE, /* Since: 0.5.10 */ AS_APP_KIND_RUNTIME, /* Since: 0.5.10 */ AS_APP_KIND_GENERIC, /* Since: 0.5.10 */ - AS_APP_KIND_DISTRO_UPGRADE, /* Since: 0.5.10 */ + AS_APP_KIND_OS_UPDATE, /* Since: 0.5.10 */ + AS_APP_KIND_OS_UPGRADE, /* Since: 0.5.10 */ AS_APP_KIND_SHELL_EXTENSION, /* Since: 0.5.10 */ /*< private >*/ AS_APP_KIND_LAST |