2005-07-11 [paul] 1.9.12cvs35

	* src/plugins/clamav/clamav_plugin_gtk.c
	* src/plugins/dillo_viewer/dillo_prefs.c
	* src/plugins/pgpmime/prefs_gpg.c
	* src/plugins/spamassassin/spamassassin_gtk.c
		gather plugins prefs together under their
		own 'Plugins' heading

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d8968c5bbb91f99338df84c8632ed736f6c42fcd..46cdfe3c914dea4acd80417cd642ccff75348c68 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2005-07-11 [paul]      1.9.12cvs35
+
+       * src/plugins/clamav/clamav_plugin_gtk.c
+       * src/plugins/dillo_viewer/dillo_prefs.c
+       * src/plugins/pgpmime/prefs_gpg.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+               gather plugins prefs together under their
+               own 'Plugins' heading
+

 2005-07-11 [paul]      1.9.12cvs34
 
        sync with main
 2005-07-11 [paul]      1.9.12cvs34
 
        sync with main

diff --git a/PATCHSETS b/PATCHSETS
index cfe90e8be6a676810f4e3ff22c5263cf44c66b2a..7f3a95fcf9413fe47679239ccacc7c301a4dbb74 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -629,3 +629,4 @@
 ( cvs diff -u -r 1.213.2.40 -r 1.213.2.41 src/folder.c;  cvs diff -u -r 1.179.2.52 -r 1.179.2.53 src/imap.c;  cvs diff -u -r 1.34.2.1 -r 1.34.2.2 src/imap.h;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/statusbar.c;  cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/statusbar.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/etpan/imap-thread.c;  ) > 1.9.12cvs32.patchset
 ( cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/etpan/imap-thread.c;  ) > 1.9.12cvs33.patchset
 ( cvs diff -u -r 1.61.2.28 -r 1.61.2.29 src/account.c;  cvs diff -u -r 1.5.12.3 -r 1.5.12.4 src/editjpilot.c;  cvs diff -u -r 1.5.12.3 -r 1.5.12.4 src/editvcard.c;  cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/prefs_template.c;  ) > 1.9.12cvs34.patchset
 ( cvs diff -u -r 1.213.2.40 -r 1.213.2.41 src/folder.c;  cvs diff -u -r 1.179.2.52 -r 1.179.2.53 src/imap.c;  cvs diff -u -r 1.34.2.1 -r 1.34.2.2 src/imap.h;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/statusbar.c;  cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/statusbar.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/etpan/imap-thread.c;  ) > 1.9.12cvs32.patchset
 ( cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/etpan/imap-thread.c;  ) > 1.9.12cvs33.patchset
 ( cvs diff -u -r 1.61.2.28 -r 1.61.2.29 src/account.c;  cvs diff -u -r 1.5.12.3 -r 1.5.12.4 src/editjpilot.c;  cvs diff -u -r 1.5.12.3 -r 1.5.12.4 src/editvcard.c;  cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/prefs_template.c;  ) > 1.9.12cvs34.patchset

+( cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/plugins/clamav/clamav_plugin_gtk.c;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpmime/prefs_gpg.c;  cvs diff -u -r 1.23.2.9 -r 1.23.2.10 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 1.9.12cvs35.patchset

diff --git a/configure.ac b/configure.ac
index d2c963ddf96d83cb782077fcab197d8965c04793..4dc43d7704a3ba36299450eb5e5631057bc1ad99 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=34
+EXTRA_VERSION=35

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/clamav/clamav_plugin_gtk.c b/src/plugins/clamav/clamav_plugin_gtk.c
index 9969de6984cd5e1a966184a17d783737e3ead6ca..38a6c40d4b859104110d3402f33b381c0477d704 100644 (file)
--- a/src/plugins/clamav/clamav_plugin_gtk.c
+++ b/src/plugins/clamav/clamav_plugin_gtk.c
@@ -246,7 +246,7 @@ gint plugin_init(gchar **error)
                return -1;
        }
 
                return -1;
        }
 

-       path[0] = _("Filtering");
+       path[0] = _("Plugins");

        path[1] = _("Clam AntiVirus");
        path[2] = NULL;
 
        path[1] = _("Clam AntiVirus");
        path[2] = NULL;
 

diff --git a/src/plugins/dillo_viewer/dillo_prefs.c b/src/plugins/dillo_viewer/dillo_prefs.c
index a6b9a5ea28a3bcc78552bab636b9a2403f1bf62e..0ff1fe007d513349cc08a60ce135ad11be14a6d6 100644 (file)
--- a/src/plugins/dillo_viewer/dillo_prefs.c
+++ b/src/plugins/dillo_viewer/dillo_prefs.c
@@ -71,7 +71,7 @@ void dillo_prefs_init(void)
        static gchar *path[3];
        gchar *rcpath;
 
        static gchar *path[3];
        gchar *rcpath;
 

-       path[0] = _("Message View");
+       path[0] = _("Plugins");

        path[1] = _("Dillo Browser");
        path[2] = NULL;
 
        path[1] = _("Dillo Browser");
        path[2] = NULL;
 

diff --git a/src/plugins/pgpmime/prefs_gpg.c b/src/plugins/pgpmime/prefs_gpg.c
index 3854efaf8422ed4014233dc8b485dbbb318f1906..a0d5ab18309d9a5be55d2c9c60302fc5b0ea8b28 100644 (file)
--- a/src/plugins/pgpmime/prefs_gpg.c
+++ b/src/plugins/pgpmime/prefs_gpg.c
@@ -500,7 +500,7 @@ void prefs_gpg_init()
        prefs_read_config(param, "GPG", rcpath, NULL);
        g_free(rcpath);
 
        prefs_read_config(param, "GPG", rcpath, NULL);
        g_free(rcpath);
 

-        path[0] = _("Privacy");
+        path[0] = _("Plugins");

         path[1] = _("GPG");
         path[2] = NULL;
 
         path[1] = _("GPG");
         path[2] = NULL;
 

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 695e6ad20acbe51eb77d2bdfaad65cef2c7e451f..e2059937aafbce12d31ec8bb842f83eafe56e18b 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -460,7 +460,7 @@ gint plugin_init(gchar **error)
                return -1;
        }
     
                return -1;
        }
     

-       path[0] = _("Filtering");
+       path[0] = _("Plugins");

        path[1] = _("SpamAssassin");
        path[2] = NULL;
 
        path[1] = _("SpamAssassin");
        path[2] = NULL;