2008-05-18 [colin] 3.4.0cvs51

[claws.git] / src / common / plugin.c

diff --git a/src/common/plugin.c b/src/common/plugin.c
index 72cf0874c99966e1b191ca1bb52b7c6371892a1e..b1983c125dfae81c78391ce0c43dcbfbd0719240 100644 (file)
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -145,7 +145,7 @@ void plugin_save_list(void)
 
                g_free(rcpath); 
                
-               return;
+               continue;
 
 revert:
                g_warning("failed to write plugin list\n");
@@ -214,6 +214,7 @@ static gint plugin_load_deps(const gchar *filename, gchar **error)
                        dep_plugin = plugin_load(path, error);
                        if (dep_plugin == NULL) {
                                g_free(path);
+                               fclose(fp);
                                return -1;
                        }
                }
@@ -361,7 +362,7 @@ init_plugin:
        
        if (strcmp(plugin_licence(), "GPL2+") && strncmp(plugin_licence(), "GPL3", strlen("GPL3"))
        &&  strncmp(plugin_licence(), "GPL2+-compatible", strlen("GPL2+-compatible"))) {
-               *error = g_strdup(_("This module is not licenced under a GPL v2 or later compatible licence."));
+               *error = g_strdup(_("This module is not licensed under a GPL v2 or later compatible license."));
                if (plugin->unloaded_hidden)
                        return NULL;
                g_module_close(plugin->module);
@@ -463,6 +464,8 @@ void plugin_load_all(const gchar *type)
        if ((pfile = prefs_read_open(rcpath)) == NULL ||
            (prefs_set_block_label(pfile, block) < 0)) {
                g_free(rcpath);
+               if (pfile)
+                       prefs_file_close(pfile);
                return;
        }
        g_free(block);