summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJan-Michael Brummer <jan.brummer@tabos.org>2020-05-12 08:57:54 +0200
committerMichael Catanzaro <mcatanzaro@gnome.org>2020-05-12 17:53:47 +0000
commitd27e58c7d546f763e6a272c06259578d522980f3 (patch)
tree0ada15fa86ff6840905259aea42204815c3a6301 /lib
parentd9153c331d0d76bdd7fd4ef6c8440d0f589418ae (diff)
downloadepiphany-d27e58c7d546f763e6a272c06259578d522980f3.tar.gz
Fix crashes in import password dialog
- Set action button insensitive if no import option is available - Propagate & display error message in case there is an issue during import Fixes: https://gitlab.gnome.org/GNOME/epiphany/-/issues/1187
Diffstat (limited to 'lib')
-rw-r--r--lib/sync/ephy-password-import.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/sync/ephy-password-import.c b/lib/sync/ephy-password-import.c
index 591a7e289..29ea4eb04 100644
--- a/lib/sync/ephy-password-import.c
+++ b/lib/sync/ephy-password-import.c
@@ -237,12 +237,14 @@ ephy_password_import_from_chrome_thread_cb (GTask *task,
GCancellable *cancellable)
{
PasswordImportChromeData *data = task_data;
- g_autoptr (GError) error = NULL;
+ GError *error = NULL;
gboolean retval;
retval = ephy_password_import_from_chrome (data->manager, data->type, &error);
-
- g_task_return_boolean (task, retval);
+ if (error)
+ g_task_return_error (task, error);
+ else
+ g_task_return_boolean (task, retval);
}
void