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

@@ -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

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}

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();
 

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";
 }

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";
 }

src/plugins/image_viewer/plugin.c

@@ -66,5 +66,5 @@ const gchar *plugin_desc(void)
 
 const gchar *plugin_type(void)
 {
-	return "GTK";
+	return "GTK2";
 }

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";
 }

src/plugins/spamassassin/spamassassin_gtk.c

@@ -499,5 +499,5 @@ const gchar *plugin_desc(void)
 
 const gchar *plugin_type(void)
 {
-	return "GTK";
+	return "GTK2";
 }

src/plugins/trayicon/trayicon.c

@@ -234,5 +234,5 @@ const gchar *plugin_desc(void)
 
 const gchar *plugin_type(void)
 {
-	return "GTK";
+	return "GTK2";
 }