2007-01-02 [colin] 2.6.1cvs93

	* src/addrbook.c
		Fix leak
	* src/common/plugin.c
		Add comment
	* src/etpan/imap-thread.c
		Fix warning

diff --git a/ChangeLog b/ChangeLog
index a6d05de634c91c0f9d572904ebd3259e8b0e3081..6b7ce7a4a28109bb18608a03f515d6cfc7243a39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-02 [colin]     2.6.1cvs93
+
+       * src/addrbook.c
+               Fix leak
+       * src/common/plugin.c
+               Add comment
+       * src/etpan/imap-thread.c
+               Fix warning
+
 2006-12-31 [paul]      2.6.1cvs92
 
        * src/prefs_summaries.c

diff --git a/PATCHSETS b/PATCHSETS
index 87df942b78a7dfdbe596c545a901293d69029fb3..e1055c235ef057627b988340f023a555a1c3d810 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2200,3 +2200,4 @@
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_quote.c;  cvs diff -u -r 1.12.2.37 -r 1.12.2.38 src/prefs_template.c;  ) > 2.6.1cvs90.patchset
 ( cvs diff -u -r 1.213.2.128 -r 1.213.2.129 src/folder.c;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/imap_gtk.c;  cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/mh_gtk.c;  ) > 2.6.1cvs91.patchset
 ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_summaries.c;  ) > 2.6.1cvs92.patchset
+( cvs diff -u -r 1.22.2.10 -r 1.22.2.11 src/addrbook.c;  cvs diff -u -r 1.13.2.23 -r 1.13.2.24 src/common/plugin.c;  cvs diff -u -r 1.1.4.61 -r 1.1.4.62 src/etpan/imap-thread.c;  ) > 2.6.1cvs93.patchset

diff --git a/configure.ac b/configure.ac
index 3bbeca563e4646c9bcebd04fe58bd12c0b5be0f0..7650f23b5117b5709bfeaafe836b36fd5f8db9de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=92
+EXTRA_VERSION=93
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrbook.c b/src/addrbook.c
index d73d5570c45be470d7830462c4be3840f34afa86..22dfbc1ac6c2372104d304d3fbc51883f3ff1def 100644 (file)
--- a/src/addrbook.c
+++ b/src/addrbook.c
@@ -612,18 +612,13 @@ static void addrbook_parse_member(AddressBookFile *book, XMLFile *file,
        while (attr) {
                name = ((XMLAttr *)attr->data)->name;
                value = ((XMLAttr *)attr->data)->value;
-               /*
-               if (strcmp(name, AB_ATTAG_PID) == 0)
-                       pid = g_strdup(value);
-               else if (strcmp(name, AB_ATTAG_EID) == 0)
-                       eid = g_strdup(value);
-               */
                if( strcmp( name, AB_ATTAG_EID ) == 0 )
                        eid = g_strdup( value );
                attr = g_list_next(attr);
        }
        /* email = addrcache_get_email( book->addressCache, pid, eid ); */
        email = addrcache_get_email(book->addressCache, eid);
+       g_free(eid);
        if (email) {
                if (group) {
                        addrcache_group_add_email(book->addressCache, group, 

diff --git a/src/common/plugin.c b/src/common/plugin.c
index 55ad8ce3f28dc8443deafea194e4b0c0d2d8fbfa..83289efca46c2c886ab4bea30ee015d3a0e57f77 100644 (file)
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -381,7 +381,10 @@ void plugin_unload(Plugin *plugin)
                plugin_done();
        }
 
+       /* comment this line when running valgrind's leak-check if
+        * you want to be able to get symbols from plugins */
        g_module_close(plugin->module);
+
        plugins = g_slist_remove(plugins, plugin);
        g_free(plugin->filename);
        g_free(plugin);

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index bfab03cc44305f9843898eac0399b5d71fe32f8a..6030636ad65db7aa66c7caf74dc5a06dfde668cc 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -445,7 +445,7 @@ static int etpan_certificate_check(const unsigned char *certificate, int len, vo
                g_warning("no cert presented.\n");
                return 0;
        }
-       cert = d2i_X509(NULL, (unsigned char **) &certificate, len);
+       cert = d2i_X509(NULL, &certificate, len);
        if (cert == NULL) {
                g_warning("can't get cert\n");
                return 0;