brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extensions-tool/uninstall: Error out for system extensions

Browse Source 
UninstallExtensions() only returns whether the operation was successful,
not why it failed. However we know that only user extensions can be
uninstalled, so check that first to provide a more meaningful error.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/2391
This commit is contained in:
Florian Müllner 2020-03-14 11:38:38 +01:00
parent 636ab4b0e9
commit 62f3457a95
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
subprojects/extensions-tool/src/command-uninstall.c
View File

@ -29,14 +29,27 @@ static gboolean
uninstall_extension (const char *uuid)
{
g_autoptr (GDBusProxy) proxy = NULL;
g_autoptr (GVariant) info = NULL;
g_autoptr (GVariant) response = NULL;
g_autoptr (GError) error = NULL;
gboolean success = FALSE;
double type;
proxy = get_shell_proxy (&error);
if (proxy == NULL)
return FALSE;
info = get_extension_property (proxy, uuid, "type");
if (info == NULL)
return FALSE;
type = g_variant_get_double (info);
if (type == TYPE_SYSTEM)
{
g_printerr (_("Cannot uninstall system extensions\n"));
return FALSE;
}
response = g_dbus_proxy_call_sync (proxy,
"UninstallExtension",
g_variant_new ("(s)", uuid),
@ -44,11 +57,6 @@ uninstall_extension (const char *uuid)
-1,
NULL,
&error);
if (response == NULL)
{
g_printerr (_("Failed to connect to GNOME Shell"));
return FALSE;
}
g_variant_get (response, "(b)", &success);