2006-03-03 [colin] 2.0.0cvs102

	* src/common/plugin.c
		Initialize error to avoid crashing when a plugin fails
		without setting error

diff --git a/ChangeLog b/ChangeLog
index 36d5592f9c062aba19e264258ecf3f81caa79fa4..6e6e063dc21b6b0e4243c377b8f0d8733d40e9e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-03 [colin]     2.0.0cvs102
+
+       * src/common/plugin.c
+               Initialize error to avoid crashing when a plugin fails
+               without setting error
+

 2006-03-02 [wwp]       2.0.0cvs101
 
        * configure.ac
 2006-03-02 [wwp]       2.0.0cvs101
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 059260f6654a44003b0ce7451533bb91f2eeb843..c145a6f6ad7e69087392c863d6c382a330d49632 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1285,3 +1285,4 @@
 ( cvs diff -u -r 1.18.2.29 -r 1.18.2.30 src/plugins/spamassassin/spamassassin.c;  ) > 2.0.0cvs99.patchset
 ( cvs diff -u -r 1.60.2.49 -r 1.60.2.50 src/addressbook.c;  ) > 2.0.0cvs100.patchset
 ( cvs diff -u -r 1.654.2.1330 -r 1.654.2.1331 configure.ac;  ) > 2.0.0cvs101.patchset
 ( cvs diff -u -r 1.18.2.29 -r 1.18.2.30 src/plugins/spamassassin/spamassassin.c;  ) > 2.0.0cvs99.patchset
 ( cvs diff -u -r 1.60.2.49 -r 1.60.2.50 src/addressbook.c;  ) > 2.0.0cvs100.patchset
 ( cvs diff -u -r 1.654.2.1330 -r 1.654.2.1331 configure.ac;  ) > 2.0.0cvs101.patchset

+( cvs diff -u -r 1.13.2.17 -r 1.13.2.18 src/common/plugin.c;  ) > 2.0.0cvs102.patchset

diff --git a/configure.ac b/configure.ac
index e3c1f2219edccfdd5617757e12147c19a601a531..c977f6166afc01af852ee1038d673e71233207ed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=101
+EXTRA_VERSION=102

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/plugin.c b/src/common/plugin.c
index 5bfb8c32add85cc61189832644e0f489e1d8156c..33b097c249880ff0e33bc79e7a2e545c8e54cc44 100644 (file)
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -336,7 +336,7 @@ void plugin_load_all(const gchar *type)
        gchar *rcpath;
        gchar buf[BUFFSIZE];
        PrefFile *pfile;
        gchar *rcpath;
        gchar buf[BUFFSIZE];
        PrefFile *pfile;

-       gchar *error, *block;
+       gchar *error = NULL, *block;

 
        plugin_types = g_slist_append(plugin_types, g_strdup(type));
 
 
        plugin_types = g_slist_append(plugin_types, g_strdup(type));