[gnome-builder] toolchain: don't warn for cancelled/not-supported
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] toolchain: don't warn for cancelled/not-supported
- Date: Mon, 25 Jun 2018 19:56:50 +0000 (UTC)
commit 5263499fe2c0166aa40bc359fbcca5d1b956ec7e
Author: Christian Hergert <chergert redhat com>
Date: Mon Jun 25 12:55:53 2018 -0700
toolchain: don't warn for cancelled/not-supported
src/libide/toolchain/ide-toolchain-manager.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/src/libide/toolchain/ide-toolchain-manager.c b/src/libide/toolchain/ide-toolchain-manager.c
index 471ef8358..e6071b073 100644
--- a/src/libide/toolchain/ide-toolchain-manager.c
+++ b/src/libide/toolchain/ide-toolchain-manager.c
@@ -135,9 +135,13 @@ ide_toolchain_manager_toolchain_load_cb (GObject *object,
context = ide_object_get_context (IDE_OBJECT (self));
if (!ide_toolchain_provider_load_finish (provider, result, &error))
- ide_context_warning (context,
- "Failed to initialize toolchain provider: %s: %s",
- G_OBJECT_TYPE_NAME (provider), error->message);
+ {
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
+ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
+ ide_context_warning (context,
+ "Failed to initialize toolchain provider: %s: %s",
+ G_OBJECT_TYPE_NAME (provider), error->message);
+ }
IDE_EXIT;
}
@@ -242,11 +246,11 @@ ide_toolchain_manager_init_load_cb (GObject *object,
if (!ide_toolchain_provider_load_finish (provider, result, &error))
{
- g_print ("%s\n", G_OBJECT_TYPE_NAME (provider));
- g_assert (error != NULL);
- ide_context_warning (context,
- "Failed to initialize toolchain provider: %s: %s",
- G_OBJECT_TYPE_NAME (provider), error->message);
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
+ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
+ ide_context_warning (context,
+ "Failed to initialize toolchain provider: %s: %s",
+ G_OBJECT_TYPE_NAME (provider), error->message);
}
providers = ide_task_get_task_data (task);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]