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

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 363bc1879f2138322a0c3aaf56dccb2aaa8d5abe..5a138294526cd104299b20b379008930d3e2dbf3 100644 (file)
--- 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
 2004-08-06 [colin]     0.9.12cvs46.1
 
        * ChangeLog

diff --git a/configure.ac b/configure.ac
index 40c48ca1d31c0e2e1e85f6d362a8d81b673b2ce8..ca851dbb1d286adc1100452417902375cdb7ca9b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=46
 EXTRA_RELEASE=
 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}
 
 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 5b1436e627b385ed9bbd31f9d66fd97afe23f705..6fa491a4e34bb95e5c0e48b6338983044f6e60fa 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -367,7 +367,7 @@ int main(int argc, char *argv[])
 
        prefs_toolbar_init();
 
 
        prefs_toolbar_init();
 

-       plugin_load_all("GTK");
+       plugin_load_all("GTK2");

        
        static_mainwindow = mainwin;
        gtk_main();
        
        static_mainwindow = mainwin;
        gtk_main();


@@ -431,7 +431,7 @@ static void exit_sylpheed(MainWindow *mainwin)
 
        main_window_destroy(mainwin);
        
 
        main_window_destroy(mainwin);
        

-       plugin_unload_all("GTK");
+       plugin_unload_all("GTK2");

 
        prefs_toolbar_done();
 
 
        prefs_toolbar_done();
 

diff --git a/src/plugins/clamav/clamav_plugin_gtk.c b/src/plugins/clamav/clamav_plugin_gtk.c
index 788371d59c601e115bf81dbbdfe5f4b0e64d8cf0..4de53d57e4d5130266cca4d2b3cf95e6d0ebe9eb 100644 (file)
--- 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)
 {
 
 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 0ec1cf06eea252e47c868009a6c83d151d6d03f1..bc3ffff48cbf999738ce84d7ca567bcb3cf730ac 100644 (file)
--- 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)
 {
 
 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 e011b8ce6c05a2c0796c35aa4da96d3d71ef24f5..23639e938a279899fa5cacc5bd55f0be28e74c23 100644 (file)
--- 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)
 {
 
 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 275e6e7c7e53e3348e6a5fe223bdb947192bfbb5..0d5c915242efd2670117bb135a09f4e0b25bdbe5 100644 (file)
--- 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)
 {
 
 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 9979d4501db35e646bcd069567e724be8f50d3d3..cfd0293470fa734f35fb2210f424a570e1d89e3e 100644 (file)
--- 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)
 {
 
 const gchar *plugin_type(void)
 {

-       return "GTK";
+       return "GTK2";

 }
 }

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 2704f4f56b1b41d0c388e3baee8e17bed6e12f79..3a443af8f3912ee82219534c2918c728c7f85c0a 100644 (file)
--- 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)
 {
 
 const gchar *plugin_type(void)
 {

-       return "GTK";
+       return "GTK2";

 }
 }