--- a/gplugin/gplugin-loader.c Sun Jan 27 05:48:39 2019 -0500
+++ b/gplugin/gplugin-loader.c Sun Jan 27 05:54:04 2019 -0500
@@ -103,7 +103,7 @@
ret = klass->load(loader, plugin, error);
+ if (!ret && error && *error == NULL) { g_set_error(error, GPLUGIN_DOMAIN, 0,
"Failed to load plugin : unknown");
@@ -138,7 +138,7 @@
if(klass && klass->unload)
ret = klass->unload(loader, plugin, error);
+ if (!ret && error && *error == NULL) { g_set_error(error, GPLUGIN_DOMAIN, 0,
"Failed to unload plugin : unknown");
--- a/gplugin/gplugin-native-loader.c Sun Jan 27 05:48:39 2019 -0500
+++ b/gplugin/gplugin-native-loader.c Sun Jan 27 05:54:04 2019 -0500
@@ -146,9 +146,11 @@
- g_set_error_literal(error, GPLUGIN_DOMAIN, 0,
- _("the query function did not return a "
- "GPluginPluginInfo instance"));
+ if (error && *error == NULL) { + g_set_error_literal(error, GPLUGIN_DOMAIN, 0, + _("the query function did not return a " + "GPluginPluginInfo instance")); @@ -163,9 +165,11 @@
if(!GPLUGIN_IS_PLUGIN_INFO(info)) {
- g_set_error_literal(error, GPLUGIN_DOMAIN, 0,
- _("the query function did not return a "
- "GPluginPluginInfo instance"));
+ if (error && *error == NULL) { + g_set_error_literal(error, GPLUGIN_DOMAIN, 0, + _("the query function did not return a " + "GPluginPluginInfo instance")); @@ -229,7 +233,8 @@
/* get and call the function */
g_object_get(G_OBJECT(plugin), "load-func", &func, NULL);
if(!func(GPLUGIN_NATIVE_PLUGIN(plugin), error)) {
- g_set_error_literal(error, GPLUGIN_DOMAIN, 0, _("unknown failure"));
+ if (error && *error == NULL) + g_set_error_literal(error, GPLUGIN_DOMAIN, 0, _("unknown failure")); @@ -261,7 +266,8 @@
/* now call the function */
if(!func(GPLUGIN_NATIVE_PLUGIN(plugin), error)) {
- g_set_error_literal(error, GPLUGIN_DOMAIN, 0, _("unknown failure"));
+ if (error && *error == NULL) + g_set_error_literal(error, GPLUGIN_DOMAIN, 0, _("unknown failure"));