CVS: sylpheedclaws/sylpheed-claws/src/plugins/clamav clamav_plugin.c,1.13.2.25.4.1,1.13.2.25.4.2 clamav_plugin_gtk.c,1.9.2.20.4.1,1.9.2.20.4.2

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/clamav
In directory sunsite.dk:/tmp/cvs-serv28725/src/plugins/clamav

Modified Files:
      Tag: stable_2_6
	clamav_plugin.c clamav_plugin_gtk.c 
Log Message:
2006-12-04 [paul]	2.6.0cvs25-stable

	* ChangeLog
	* Makefile.am
	* configure.ac
	* m4/aclocal-include.m4
	* m4/check-type.m4
	* src/Makefile.am
	* src/addr_compl.c
	* src/compose.c
	* src/crash.c
	* src/export.c
	* src/exporthtml.c
	* src/exportldif.c
	* src/imap.c
	* src/import.c
	* src/main.c
	* src/main.h
	* src/matcher.c
	* src/mimeview.c
	* src/procmsg.c
	* src/common/Makefile.am
	* src/common/claws.c
	* src/common/claws.h
	* src/common/ssl.c
	* src/common/sylpheed.c
	* src/common/sylpheed.h
	* src/etpan/Makefile.am
	* src/gtk/Makefile.am
	* src/gtk/claws-marshal.list
	* src/gtk/filesel.c
	* src/gtk/gtksctree.c
	* src/gtk/quicksearch.c
	* src/gtk/sylpheed-marshal.list
	* src/plugins/bogofilter/bogofilter.c
	* src/plugins/bogofilter/bogofilter_gtk.c
	* src/plugins/clamav/clamav_plugin.c
	* src/plugins/clamav/clamav_plugin_gtk.c
	* src/plugins/demo/demo.c
	* src/plugins/dillo_viewer/dillo_viewer.c
	* src/plugins/pgpcore/Makefile.am
	* src/plugins/pgpcore/claws.def
	* src/plugins/pgpcore/pgp_viewer.c
	* src/plugins/pgpcore/plugin.c
	* src/plugins/pgpcore/sylpheed.def
	* src/plugins/pgpinline/Makefile.am
	* src/plugins/pgpinline/claws.def
	* src/plugins/pgpinline/plugin.c
	* src/plugins/pgpinline/sylpheed.def
	* src/plugins/pgpmime/Makefile.am
	* src/plugins/pgpmime/claws.def
	* src/plugins/pgpmime/plugin.c
	* src/plugins/pgpmime/sylpheed.def
	* src/plugins/spamassassin/spamassassin.c
	* src/plugins/spamassassin/spamassassin_gtk.c
	* src/plugins/trayicon/trayicon.c
		backport from 2.6.0cvs64:
		yet more renaming 

Index: clamav_plugin.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/clamav/clamav_plugin.c,v
retrieving revision 1.13.2.25.4.1
retrieving revision 1.13.2.25.4.2
diff -u -d -r1.13.2.25.4.1 -r1.13.2.25.4.2
--- clamav_plugin.c	2006/11/24 13:13:45	1.13.2.25.4.1
+++ clamav_plugin.c	2006/12/04 14:22:17	1.13.2.25.4.2
@@ -27,7 +27,7 @@
 #include <glib/gi18n.h>
 #include <clamav.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "utils.h"
@@ -194,12 +194,12 @@
 	int ret;
 	unsigned int no;
 
-	if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+	if ((claws_get_version() > VERSION_NUMERIC)) {
 		*error = g_strdup(_("Your version of Claws Mail is newer than the version the ClamAV plugin was built with"));
 		return -1;
 	}
 
-	if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+	if ((claws_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
 		*error = g_strdup(_("Your version of Claws Mail is too old for the ClamAV plugin"));
 		return -1;
 	}

Index: clamav_plugin_gtk.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/clamav/clamav_plugin_gtk.c,v
retrieving revision 1.9.2.20.4.1
retrieving revision 1.9.2.20.4.2
diff -u -d -r1.9.2.20.4.1 -r1.9.2.20.4.2
--- clamav_plugin_gtk.c	2006/11/24 13:13:46	1.9.2.20.4.1
+++ clamav_plugin_gtk.c	2006/12/04 14:22:17	1.9.2.20.4.2
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkutils.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "utils.h"