Bug#412846: sylpheed-claws: diff for NMU version 1.0.5-5.1

[Stephen Gran]

Package: sylpheed-claws
Version: 1.0.5-5
Severity: normal
Tags: patch

Hi,

Attached is the diff for my sylpheed-claws 1.0.5-5.1 NMU.

I plan to upload this in the next day or two, unless you have any
objections.

Thanks,
-- 
 -----------------------------------------------------------------
|   ,''`.                                            Stephen Gran |
|  : :' :                                        [EMAIL PROTECTED] |
|  `. `'                        Debian user, admin, and developer |
|    `-                                     http://www.debian.org |
 -----------------------------------------------------------------

diff -u sylpheed-claws-1.0.5/debian/changelog sylpheed-claws-1.0.5/debian/changelog
--- sylpheed-claws-1.0.5/debian/changelog
+++ sylpheed-claws-1.0.5/debian/changelog
@@ -1,3 +1,10 @@
+sylpheed-claws (1.0.5-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update to new clamav API
+
+ -- Stephen Gran <[EMAIL PROTECTED]>  Tue, 27 Feb 2007 23:52:35 +0000
+
 sylpheed-claws (1.0.5-5) unstable; urgency=low
 
   * debian/control
only in patch2:
unchanged:
--- sylpheed-claws-1.0.5.orig/src/plugins/clamav/clamav_plugin.c
+++ sylpheed-claws-1.0.5/src/plugins/clamav/clamav_plugin.c
@@ -105,6 +105,7 @@
 	MimeInfo *mimeinfo;
 
 	int ret, no = 0;
+	unsigned int cl_options = CL_DB_STDOPT;
 	struct scan_parameters params;
 
 	if (!config.clamav_enable)
@@ -127,14 +128,14 @@
 	if (config.clamav_enable_arc)
 		params.scan_archive = TRUE;
 
-    	if ((ret = cl_loaddbdir(cl_retdbdir(), &params.root, &no))) {
-		debug_print("cl_loaddbdir: %s\n", cl_strerror(ret));
+    	if ((ret = cl_load(cl_retdbdir(), &params.root, &no, cl_options))) {
+		debug_print("cl_load: %s\n", cl_strerror(ret));
 		return FALSE;
     	}
 
     	debug_print("Database loaded (containing in total %d signatures)\n", no);
 
-    	cl_buildtrie(params.root);
+    	cl_build(params.root);
 
 	g_node_traverse(mimeinfo->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, scan_func, &params);
 
@@ -154,7 +155,7 @@
 		}
 	}
 	
-    	cl_freetrie(params.root);
+    	cl_free(params.root);
 	procmime_mimeinfo_free_all(mimeinfo);
 	
 	return params.is_infected;

signature.asc
Description: Digital signature