From 9954fa714176e095ae5a1b126ff361fe05644910 Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Fri, 6 Aug 2004 14:47:07 +0000
Subject: [PATCH] 0.9.12cvs46.2

* src/main.c
* src/plugins/clamav/clamav_plugin_gtk.c
* src/plugins/dillo_viewer/dillo_viewer.c
* src/plugins/image_viewer/plugin.c
* src/plugins/mathml_viewer/mathml_viewer.c
* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/trayicon/trayicon.c
        don't mix GTK1.2 plugin with GTK2 plugins
---
 ChangeLog-gtk2.claws                        | 11 +++++++++++
 configure.ac                                |  2 +-
 src/main.c                                  |  4 ++--
 src/plugins/clamav/clamav_plugin_gtk.c      |  2 +-
 src/plugins/dillo_viewer/dillo_viewer.c     |  2 +-
 src/plugins/image_viewer/plugin.c           |  2 +-
 src/plugins/mathml_viewer/mathml_viewer.c   |  2 +-
 src/plugins/spamassassin/spamassassin_gtk.c |  2 +-
 src/plugins/trayicon/trayicon.c             |  2 +-
 9 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 363bc1879..5a1382945 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,14 @@
+2004-08-06 [christoph]	0.9.12cvs46.2
+
+	* src/main.c
+	* src/plugins/clamav/clamav_plugin_gtk.c
+	* src/plugins/dillo_viewer/dillo_viewer.c
+	* src/plugins/image_viewer/plugin.c
+	* src/plugins/mathml_viewer/mathml_viewer.c
+	* src/plugins/spamassassin/spamassassin_gtk.c
+	* src/plugins/trayicon/trayicon.c
+		don't mix GTK1.2 plugin with GTK2 plugins
+
 2004-08-06 [colin]	0.9.12cvs46.1
 
 	* ChangeLog
diff --git a/configure.ac b/configure.ac
index 40c48ca1d..ca851dbb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=46
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
diff --git a/src/main.c b/src/main.c
index 5b1436e62..6fa491a4e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -367,7 +367,7 @@ int main(int argc, char *argv[])
 
 	prefs_toolbar_init();
 
-	plugin_load_all("GTK");
+	plugin_load_all("GTK2");
 	
 	static_mainwindow = mainwin;
 	gtk_main();
@@ -431,7 +431,7 @@ static void exit_sylpheed(MainWindow *mainwin)
 
 	main_window_destroy(mainwin);
 	
-	plugin_unload_all("GTK");
+	plugin_unload_all("GTK2");
 
 	prefs_toolbar_done();
 
diff --git a/src/plugins/clamav/clamav_plugin_gtk.c b/src/plugins/clamav/clamav_plugin_gtk.c
index 788371d59..4de53d57e 100644
--- a/src/plugins/clamav/clamav_plugin_gtk.c
+++ b/src/plugins/clamav/clamav_plugin_gtk.c
@@ -285,5 +285,5 @@ const gchar *plugin_desc(void)
 
 const gchar *plugin_type(void)
 {
-	return "GTK";
+	return "GTK2";
 }
diff --git a/src/plugins/dillo_viewer/dillo_viewer.c b/src/plugins/dillo_viewer/dillo_viewer.c
index 0ec1cf06e..bc3ffff48 100644
--- a/src/plugins/dillo_viewer/dillo_viewer.c
+++ b/src/plugins/dillo_viewer/dillo_viewer.c
@@ -201,5 +201,5 @@ const gchar *plugin_desc(void)
 
 const gchar *plugin_type(void)
 {
-	return "GTK";
+	return "GTK2";
 }
diff --git a/src/plugins/image_viewer/plugin.c b/src/plugins/image_viewer/plugin.c
index e011b8ce6..23639e938 100644
--- a/src/plugins/image_viewer/plugin.c
+++ b/src/plugins/image_viewer/plugin.c
@@ -66,5 +66,5 @@ const gchar *plugin_desc(void)
 
 const gchar *plugin_type(void)
 {
-	return "GTK";
+	return "GTK2";
 }
diff --git a/src/plugins/mathml_viewer/mathml_viewer.c b/src/plugins/mathml_viewer/mathml_viewer.c
index 275e6e7c7..0d5c91524 100644
--- a/src/plugins/mathml_viewer/mathml_viewer.c
+++ b/src/plugins/mathml_viewer/mathml_viewer.c
@@ -171,5 +171,5 @@ const gchar *plugin_desc(void)
 
 const gchar *plugin_type(void)
 {
-	return "GTK";
+	return "GTK2";
 }
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 9979d4501..cfd029347 100644
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -499,5 +499,5 @@ const gchar *plugin_desc(void)
 
 const gchar *plugin_type(void)
 {
-	return "GTK";
+	return "GTK2";
 }
diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 2704f4f56..3a443af8f 100644
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -234,5 +234,5 @@ const gchar *plugin_desc(void)
 
 const gchar *plugin_type(void)
 {
-	return "GTK";
+	return "GTK2";
 }
-- 
2.25.1