[Commits] [SCM] claws branch, master, updated. 3.9.0-186-g1a980a6

[mones at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  1a980a6ed69e4c979dd268c5d3a875548289e587 (commit)
       via  c282d90e6d5a2764dcfe1c2c88c83ecee2cabd86 (commit)
      from  6e07ee63b095bed0a715007327639c9e0a51c723 (commit)


- Log -----------------------------------------------------------------
commit 1a980a6ed69e4c979dd268c5d3a875548289e587
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Apr 19 00:17:16 2013 +0200

    Fix bug #2878 'bsfilter / folder.c:1435 Condition identifier != NULL failed'
    
    Don't call folder_find_item_from_identifier if using default
    NULL value

diff --git a/src/plugins/bsfilter/bsfilter.c b/src/plugins/bsfilter/bsfilter.c
index e86cc99..8484b2c 100644
--- a/src/plugins/bsfilter/bsfilter.c
+++ b/src/plugins/bsfilter/bsfilter.c
@@ -587,7 +587,11 @@ gint plugin_init(gchar **error)
 
 FolderItem *bsfilter_get_spam_folder(MsgInfo *msginfo)
 {
-	FolderItem *item = folder_find_item_from_identifier(config.save_folder);
+	FolderItem *item = NULL;
+	
+	if (config.save_folder != NULL) {
+		item = folder_find_item_from_identifier(config.save_folder);
+	}
 
 	if (item || msginfo == NULL || msginfo->folder == NULL)
 		return item;

commit c282d90e6d5a2764dcfe1c2c88c83ecee2cabd86
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Apr 19 00:14:25 2013 +0200

    Update year in manual copyright notices

diff --git a/manual/claws-mail-manual.xml b/manual/claws-mail-manual.xml
index 4d02c68..f2462ce 100644
--- a/manual/claws-mail-manual.xml
+++ b/manual/claws-mail-manual.xml
@@ -21,7 +21,7 @@
 	    <ulink url="http://www.claws-mail.org/">The Claws Mail Team</ulink>
     </corpauthor>
     <copyright>
-      <year>2006-2011</year>
+      <year>2006-2013</year>
       <holder>The Claws Mail Team.</holder>
     </copyright>
     <legalnotice id="license">
diff --git a/manual/de/claws-mail-manual.xml b/manual/de/claws-mail-manual.xml
index ac7b25f..f92e9a8 100644
--- a/manual/de/claws-mail-manual.xml
+++ b/manual/de/claws-mail-manual.xml
@@ -21,7 +21,7 @@
       <ulink url="http://www.claws-mail.org/">Das Team von Claws Mail</ulink> 
     </corpauthor> 
     <copyright> 
-      <year>2006-2011</year>
+      <year>2006-2013</year>
       <holder>Das Team von Claws Mail.</holder>
     </copyright>
     <legalnotice id="license">
diff --git a/manual/es/claws-mail-manual.xml b/manual/es/claws-mail-manual.xml
index 77d3547..6fcbf53 100644
--- a/manual/es/claws-mail-manual.xml
+++ b/manual/es/claws-mail-manual.xml
@@ -22,7 +22,7 @@
 	    <ulink url="http://www.claws-mail.org/">El equipo de &SC;</ulink>
     </corpauthor>
     <copyright>
-      <year>2006-2011</year>
+      <year>2006-2013</year>
       <holder>El equipo de &SC;.</holder>
     </copyright>
     <legalnotice id="license">
diff --git a/manual/fr/claws-mail-manual.xml b/manual/fr/claws-mail-manual.xml
index 2ff1aae..4a29796 100644
--- a/manual/fr/claws-mail-manual.xml
+++ b/manual/fr/claws-mail-manual.xml
@@ -21,7 +21,7 @@
       <ulink url="http://www.claws-mail.org/">L'équipe de Claws Mail</ulink>
     </corpauthor>
     <copyright>
-      <year>2006-2011</year>
+      <year>2006-2013</year>
       <holder>L'équipe de Claws Mail.</holder>
     </copyright>
     <legalnotice id="license">
diff --git a/manual/it/claws-mail-manual.xml b/manual/it/claws-mail-manual.xml
index 5643a9a..750762c 100644
--- a/manual/it/claws-mail-manual.xml
+++ b/manual/it/claws-mail-manual.xml
@@ -21,7 +21,7 @@
 	    <ulink url="http://www.claws-mail.org/">Il Team di Claws Mail</ulink>
     </corpauthor>
     <copyright>
-      <year>2006-2011</year>
+      <year>2006-2013</year>
       <holder>Il Team di Claws Mail.</holder>
     </copyright>
     <legalnotice id="license">
diff --git a/manual/pl/claws-mail-manual.xml b/manual/pl/claws-mail-manual.xml
index ea2cbf3..417afe4 100644
--- a/manual/pl/claws-mail-manual.xml
+++ b/manual/pl/claws-mail-manual.xml
@@ -21,7 +21,7 @@
       <ulink url="http://www.claws-mail.org/">Autorzy Claws Mail</ulink>
     </corpauthor>
     <copyright>
-      <year>2006</year>
+      <year>2006-2013</year>
       <holder>Autorzy Claws Mail.</holder>
     </copyright>
     <legalnotice id="license">

-----------------------------------------------------------------------

Summary of changes:
 manual/claws-mail-manual.xml    |    2 +-
 manual/de/claws-mail-manual.xml |    2 +-
 manual/es/claws-mail-manual.xml |    2 +-
 manual/fr/claws-mail-manual.xml |    2 +-
 manual/it/claws-mail-manual.xml |    2 +-
 manual/pl/claws-mail-manual.xml |    2 +-
 src/plugins/bsfilter/bsfilter.c |    6 +++++-
 7 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Claws Mail