diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2013-06-22 19:16:55 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-19 13:48:14 +0000 |
| commit | 226f1eae705a3c05715b4213fbff5b05b995af5e (patch) | |
| tree | 70d70d666fb4365350ac8206eddd9a7b46bce732 | |
| parent | 892d6d57b6e8bec11bc7693b5f58cffac158a184 (diff) | |
plugin-loader: clear GError after g_dir_open fails
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66085
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | src/plugin-loader.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugin-loader.c b/src/plugin-loader.c index d308437ee..2e14c0781 100644 --- a/src/plugin-loader.c +++ b/src/plugin-loader.c @@ -108,7 +108,6 @@ plugin_loader_try_to_load ( static void gabble_plugin_loader_probe (GabblePluginLoader *self) { - GError *error = NULL; const gchar *directory_names = g_getenv ("GABBLE_PLUGIN_DIR"); gchar **dir_array; gchar **ptr; @@ -132,13 +131,15 @@ gabble_plugin_loader_probe (GabblePluginLoader *self) for (ptr = dir_array ; *ptr != NULL ; ptr++) { + GError *error = NULL; + DEBUG ("probing %s", *ptr); d = g_dir_open (*ptr, 0, &error); if (d == NULL) { DEBUG ("%s", error->message); - g_error_free (error); + g_clear_error (&error); continue; } |