[gnome-software/wip/mak/libas: 2/6] Delete defunct remnants of shell-extension support
- From: Matthias Klumpp <mak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/mak/libas: 2/6] Delete defunct remnants of shell-extension support
- Date: Fri, 15 Jan 2021 02:35:47 +0000 (UTC)
commit 11a355949ed6ad5a1f258cd974bc112f90e041f9
Author: Matthias Klumpp <matthias tenstral net>
Date: Fri Jan 8 01:46:37 2021 +0100
Delete defunct remnants of shell-extension support
plugins/core/gs-appstream.c | 9 ---------
plugins/malcontent/gs-plugin-malcontent.c | 1 -
plugins/rpm-ostree/gs-plugin-rpm-ostree.c | 4 ----
src/gs-details-page.c | 1 -
src/gs-installed-page.c | 5 +----
src/gs-search-page.c | 1 -
src/gs-updates-section.c | 5 +----
7 files changed, 2 insertions(+), 24 deletions(-)
---
diff --git a/plugins/core/gs-appstream.c b/plugins/core/gs-appstream.c
index 494749c7e..f7b9844cf 100644
--- a/plugins/core/gs-appstream.c
+++ b/plugins/core/gs-appstream.c
@@ -31,15 +31,6 @@ gs_appstream_create_app (GsPlugin *plugin, XbSilo *silo, XbNode *component, GErr
if (gs_app_has_quirk (app_new, GS_APP_QUIRK_IS_WILDCARD))
return g_steal_pointer (&app_new);
- /* no longer supported */
- if (gs_app_get_kind (app_new) == AS_COMPONENT_KIND_SHELL_EXTENSION) {
- g_set_error (error,
- GS_PLUGIN_ERROR,
- GS_PLUGIN_ERROR_NOT_SUPPORTED,
- "shell extensions no longer supported");
- return NULL;
- }
-
/* look for existing object */
app = gs_plugin_cache_lookup (plugin, gs_app_get_unique_id (app_new));
if (app != NULL)
diff --git a/plugins/malcontent/gs-plugin-malcontent.c b/plugins/malcontent/gs-plugin-malcontent.c
index 9972a6911..afff5fa7d 100644
--- a/plugins/malcontent/gs-plugin-malcontent.c
+++ b/plugins/malcontent/gs-plugin-malcontent.c
@@ -78,7 +78,6 @@ app_is_expected_to_have_content_rating (GsApp *app)
case AS_COMPONENT_KIND_UNKNOWN:
case AS_COMPONENT_KIND_DESKTOP_APP:
case AS_COMPONENT_KIND_WEB_APP:
- case AS_COMPONENT_KIND_SHELL_EXTENSION:
case AS_COMPONENT_KIND_CONSOLE_APP:
default:
break;
diff --git a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
index c799cd77d..419258559 100644
--- a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
+++ b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
@@ -1610,10 +1610,6 @@ gs_plugin_launch (GsPlugin *plugin,
gs_plugin_get_name (plugin)) != 0)
return TRUE;
- /* these are handled by the shell extensions plugin */
- if (gs_app_get_kind (app) == AS_COMPONENT_KIND_SHELL_EXTENSION)
- return TRUE;
-
return gs_plugin_app_launch (plugin, app, error);
}
diff --git a/src/gs-details-page.c b/src/gs-details-page.c
index 9eb0c1e52..8ac574144 100644
--- a/src/gs-details-page.c
+++ b/src/gs-details-page.c
@@ -1627,7 +1627,6 @@ gs_details_page_refresh_reviews (GsDetailsPage *self)
case AS_COMPONENT_KIND_FONT:
case AS_COMPONENT_KIND_INPUT_METHOD:
case AS_COMPONENT_KIND_WEB_APP:
- case AS_COMPONENT_KIND_SHELL_EXTENSION:
/* don't show a missing rating on a local file */
if (gs_app_get_state (self->app) != GS_APP_STATE_AVAILABLE_LOCAL &&
self->enable_reviews)
diff --git a/src/gs-installed-page.c b/src/gs-installed-page.c
index 721a966c1..2f69ffea0 100644
--- a/src/gs-installed-page.c
+++ b/src/gs-installed-page.c
@@ -360,11 +360,8 @@ gs_installed_page_get_app_sort_key (GsApp *app)
case AS_COMPONENT_KIND_INPUT_METHOD:
g_string_append (key, "7:");
break;
- case AS_COMPONENT_KIND_SHELL_EXTENSION:
- g_string_append (key, "8:");
- break;
default:
- g_string_append (key, "9:");
+ g_string_append (key, "8:");
break;
}
diff --git a/src/gs-search-page.c b/src/gs-search-page.c
index 48f31dba5..07832e9ad 100644
--- a/src/gs-search-page.c
+++ b/src/gs-search-page.c
@@ -191,7 +191,6 @@ gs_search_page_get_app_sort_key (GsApp *app)
/* sort apps before runtimes and extensions */
switch (gs_app_get_kind (app)) {
case AS_COMPONENT_KIND_DESKTOP_APP:
- case AS_COMPONENT_KIND_SHELL_EXTENSION:
g_string_append (key, "9:");
break;
default:
diff --git a/src/gs-updates-section.c b/src/gs-updates-section.c
index c87f75125..b30a25ff4 100644
--- a/src/gs-updates-section.c
+++ b/src/gs-updates-section.c
@@ -166,11 +166,8 @@ _get_app_sort_key (GsApp *app)
case AS_COMPONENT_KIND_INPUT_METHOD:
g_string_append (key, "7:");
break;
- case AS_COMPONENT_KIND_SHELL_EXTENSION:
- g_string_append (key, "8:");
- break;
default:
- g_string_append (key, "9:");
+ g_string_append (key, "8:");
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]