CVS: sylpheedclaws/sylpheed-claws/src/plugins/pgpmime claws.def,NONE,1.1.4.1 Makefile.am,1.1.2.7.10.1,1.1.2.7.10.2 plugin.c,1.1.2.20.4.1,1.1.2.20.4.2 sylpheed.def,1.1.2.4.4.1,NONE

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

Modified Files:
      Tag: stable_2_6
	Makefile.am plugin.c 
Added Files:
      Tag: stable_2_6
	claws.def 
Removed Files:
      Tag: stable_2_6
	sylpheed.def 
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 

--- NEW FILE: claws.def ---
LIBRARY CLAWS-MAIL.EXE
EXPORTS
canonicalize_str
debug_print_real
debug_srcname
file_read_stream_to_str
generate_mime_boundary
get_mime_tmp_dir
my_tmpfile
privacy_register_system
privacy_unregister_system
procmime_mimeinfo_free_all
procmime_mimeinfo_get_parameter
procmime_mimeinfo_new
procmime_mimeinfo_parent
procmime_scan_file
procmime_write_mimeinfo
claws_get_version
privacy_set_error
privacy_get_error

Index: Makefile.am
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/pgpmime/Makefile.am,v
retrieving revision 1.1.2.7.10.1
retrieving revision 1.1.2.7.10.2
diff -u -d -r1.1.2.7.10.1 -r1.1.2.7.10.2
--- Makefile.am	2006/11/24 13:14:15	1.1.2.7.10.1
+++ Makefile.am	2006/12/04 14:22:32	1.1.2.7.10.2
@@ -1,4 +1,4 @@
-EXTRA_DIST = version.rc plugin.def sylpheed.def mypgpcore.def pgpmime.deps
+EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpmime.deps
 
 if OS_WIN32
 
@@ -14,15 +14,15 @@
 
 export_symbols = -export-symbols $(srcdir)/plugin.def
 
-plugin_deps = libsylpheed.a libmypgpcore.a $(plugin_res) plugin.def
+plugin_deps = libclaws.a libmypgpcore.a $(plugin_res) plugin.def
 
-libsylpheed.a: sylpheed.def
+libclaws.a: claws.def
 	$(DLLTOOL) --output-lib $@ --def $<
 
 libmypgpcore.a: mypgpcore.def
 	$(DLLTOOL) --output-lib $@ --def $<
 
-plugin_ldadd = -L . -lsylpheed -lmypgpcore
+plugin_ldadd = -L . -lclaws -lmypgpcore
 
 else
 plugin_res =
@@ -79,4 +79,4 @@
 	-Wno-deprecated-declarations
 
 clean-local:
-	rm -f libsylpheed.a
+	rm -f libclaws.a

Index: plugin.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/pgpmime/plugin.c,v
retrieving revision 1.1.2.20.4.1
retrieving revision 1.1.2.20.4.2
diff -u -d -r1.1.2.20.4.1 -r1.1.2.20.4.2
--- plugin.c	2006/11/24 13:14:16	1.1.2.20.4.1
+++ plugin.c	2006/12/04 14:22:33	1.1.2.20.4.2
@@ -26,17 +26,17 @@
 #include <glib/gi18n.h>
 
 #include "version.h"
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "pgpmime.h"
 
 gint plugin_init(gchar **error)
 {
-	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 PGP/MIME plugin was built with"));
 		return -1;
 	}
 
-	if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) {
+	if ((claws_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) {
 		*error = g_strdup(_("Your version of Claws Mail is too old for the PGP/MIME plugin"));
 		return -1;
 	}

--- sylpheed.def DELETED ---