2006-11-12 [paul] 2.6.0cvs34

	* doc/man/claws-mail.1
	* src/prefs_gtk.c
	* src/plugins/clamav/README
	* src/plugins/spamassassin/README
	* tools/README
	* tools/freshmeat_search.pl
	* tools/google_search.pl
	* tools/multiwebsearch.pl
		more renaming
	* src/plugins/trayicon/trayicon.c
		fix compiliation warning

diff --git a/ChangeLog b/ChangeLog
index 120c868..7c86509 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-11-12 [paul]      2.6.0cvs34
+
+       * doc/man/claws-mail.1
+       * src/prefs_gtk.c
+       * src/plugins/clamav/README
+       * src/plugins/spamassassin/README
+       * tools/README
+       * tools/freshmeat_search.pl
+       * tools/google_search.pl
+       * tools/multiwebsearch.pl
+               more renaming
+       * src/plugins/trayicon/trayicon.c
+               fix compiliation warning
+
 2006-11-11 [colin]     2.6.0cvs33
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 2695482..3d2818f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2058,3 +2058,4 @@
 ( cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/pgpmime/pgpmime.c;  ) > 2.6.0cvs31.patchset
 ( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpinline/pgpinline.c;  ) > 2.6.0cvs32.patchset
 ( cvs diff -u -r 1.207.2.132 -r 1.207.2.133 src/folderview.c;  ) > 2.6.0cvs33.patchset
+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 doc/man/claws-mail.1;  cvs diff -u -r 1.10.2.26 -r 1.10.2.27 src/prefs_gtk.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/plugins/clamav/README;  cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/plugins/spamassassin/README;  cvs diff -u -r 1.14.2.42 -r 1.14.2.43 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.30.2.11 -r 1.30.2.12 tools/README;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 tools/freshmeat_search.pl;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 tools/google_search.pl;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 tools/multiwebsearch.pl;  ) > 2.6.0cvs34.patchset

diff --git a/configure.ac b/configure.ac
index f394346..2b3762f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/doc/man/claws-mail.1 b/doc/man/claws-mail.1
index f36fb1e..cd39751 100644 (file)
--- a/doc/man/claws-mail.1
+++ b/doc/man/claws-mail.1
@@ -170,10 +170,10 @@ Folder hierarchy listing
 $HOME/.claws\-mail/menurc
 Menu shortcut\-key configuration
 .TP 
-$HOME/.claws\-mail/claws\-mail.log
-Sylpheed logfile
+$HOME/.claws\-mail/claws.log
+Claws Mail logfile
 .TP 
-$HOME/.claws\-mail/sylpheedrc
+$HOME/.claws\-mail/clawsrc
 Main configuration file
 
 
@@ -272,21 +272,21 @@ Refer to ./configure \-\-help for further information.
 The Claws Mail Team
 Holger Berndt                  <berndth@users.sf.net>
 .br 
+Tristan Chabredier             <wwp@claws-mail.org>
+.br 
 Ho\(`a Vi\(^et Dinh                    <hoa@users.sf.net>
 .br 
 Werner Koch                    <wk@gnupg.org>
 .br 
 Darko Koruga                   <darko@users.sf.net>
 .br 
-Ricardo Mones Lastra   <mones@users.sf.net>
+Ricardo Mones Lastra   <ricardo@mones.org>
 .br 
-Colin Leroy                    <colinleroy@users.sf.net>
+Colin Leroy                    <colin@colino.net>
 .br 
-Paul Mangan                    <twb@users.sf.net>
+Paul Mangan                    <paul@claws-mail.org>
 .br 
 Martin Schaaf                  <mascha1@users.sf.net>
-.br 
-Tristan Chabredier             <wwp@users.sf.net>
 
 .TP 
 Previous team members

diff --git a/src/plugins/clamav/README b/src/plugins/clamav/README
index fbe92a6..5e95b98 100644 (file)
--- a/src/plugins/clamav/README
+++ b/src/plugins/clamav/README
@@ -11,22 +11,15 @@ configuration, if the folder is not specified or not found
 the default trash folder will be used.
 
 The plugin is built automatically if you have the required
-libraries available. It has two parts and will be installed
-in $PREFIX/lib/sylpheed/plugins/ as clamav_plugin.so and
-clamav_plugin_gtk.so.
-
-The 'clamav_plugin.so' plugin provides only the actual 
-scanning. By default it is not enabled. 
-
-You will probably also want to load the configuration plugin
-'clamav_plugin_gtk.so' to get a configuration page under 
-"Configuration/Other Preferences.../Filtering/Clam AntiVirus" 
-for the Clam AntiVirus plugin.
-
-The Clam AntiVirus plugin uses its own block in the 'sylpheedrc' 
-file in your config directory (default: '~/.sylpheed'). If you 
-really want to configure it without the GTK plugin you can 
-specify the following options:
+libraries available. It will be installed in
+$PREFIX/lib/claws-mail/plugins/ as clamav_plugin.so.
+
+Configuration preferences are found on the 
+"/Configuration/Preferences.../Plugins/Clam AntiVirus" page.
+
+The Clam AntiVirus plugin uses its own block in the 'clawsrc' 
+file in your config directory (default: '~/.claws-mail'). It
+has the following options:
 
 [ClamAV]
 clamav_enable=1                                enable scanning with Clam AntiVirus

diff --git a/src/plugins/spamassassin/README b/src/plugins/spamassassin/README
index 996936a..e4b96cb 100644 (file)
--- a/src/plugins/spamassassin/README
+++ b/src/plugins/spamassassin/README
@@ -12,16 +12,17 @@ using the external command sa-learn in local modes or spamc in TCP mode
 messages as spam or ham can be added to the main window or the message
 window (see "Configuration/Preferences/Customize toolbars).
 
-To build the plugin run configure with --enable-spamassassin-plugin.
+The plugin is built automatically if you have the required libraries
+available.
 
 Message that are classified as spam can be deleted or moved to a folder
 that can be specified in the configuration, if the folder is not
 specified or not found the default trash folder will be used.
 
-Plugin preferences can be found under "Configuration/Preferences/Plugins
+Plugin preferences can be found under "/Configuration/Preferences/Plugins
 /SpamAssassin". 
 
-The SpamAssassin plugin uses it's own block in the sylpheedrc file in your
+The SpamAssassin plugin uses it's own block in the clawsrc file in your
 ~/.claws-mail/ directory, and define the following options:
 
 [SpamAssassin]

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index b92bb29..15fdfbd 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -40,6 +40,7 @@
 #include "prefs_common.h"
 #include "main.h"
 #include "alertpanel.h"
+#include "account.h"
 #include "gtk/manage_window.h"
 
 #include "eggtrayicon.h"

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index 244fe2b..e582e32 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -1008,7 +1008,7 @@ static int prefs_cache(const gchar *rcfile)
 
 void prefs_prepare_cache(void)
 {
-       gchar *sylpheedrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
+       gchar *clawsrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
        gchar *folderitemrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, FOLDERITEM_RC, NULL);
        gchar *accountrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
        
@@ -1017,17 +1017,17 @@ void prefs_prepare_cache(void)
                                g_free, prefs_destroy_whole_cache);
        } else {
                debug_print("already cached\n");
-               g_free(sylpheedrc);
+               g_free(clawsrc);
                g_free(folderitemrc);
                g_free(accountrc);
                return;
        }
-       if (prefs_cache(sylpheedrc) < 0 ||
+       if (prefs_cache(clawsrc) < 0 ||
            prefs_cache(folderitemrc) < 0 ||
            prefs_cache(accountrc) < 0)
                prefs_destroy_cache();
 
-       g_free(sylpheedrc);
+       g_free(clawsrc);
        g_free(folderitemrc);
        g_free(accountrc);
 }

diff --git a/tools/README b/tools/README
index bac7196..e37313e 100644 (file)
--- a/tools/README
+++ b/tools/README
@@ -83,8 +83,8 @@ Action scripts
        This is an Actions script that allows you to search
        websites for the selected text. It uses the default
        Claws Mail browser as configured through Claws Mail's 
-       GUI and specified in ~/.claws-mail/sylpheedrc,
-       and a configuration file called multiwebsearch.conf.
+       GUI and specified in ~/.claws-mail/clawsrc, and a
+       configuration file called multiwebsearch.conf.
        
   CONFIGURATION
        The configuration file takes the following format:

diff --git a/tools/freshmeat_search.pl b/tools/freshmeat_search.pl
index aa830e4..5f48f53 100644 (file)
--- a/tools/freshmeat_search.pl
+++ b/tools/freshmeat_search.pl
@@ -22,7 +22,7 @@ $_ = <>;
 
 chdir($ENV{HOME} . "/.claws-mail") || die("Can't find your .claws-mail directory\n");
 
-open (SYLRC, "<sylpheedrc") || die("Can't open the sylpheedrc file\n");
+open (SYLRC, "<clawsrc") || die("Can't open the clawsrc file\n");
        @rclines = <SYLRC>;
 close SYLRC;
 

diff --git a/tools/google_search.pl b/tools/google_search.pl
index 52a6487..8c211a9 100644 (file)
--- a/tools/google_search.pl
+++ b/tools/google_search.pl
@@ -22,7 +22,7 @@ $_ = <>;
 
 chdir($ENV{HOME} . "/.claws-mail") || die("Can't find your .claws-mail directory\n");
 
-open (SYLRC, "<sylpheedrc") || die("Can't open the sylpheedrc file\n");
+open (SYLRC, "<clawsrc") || die("Can't open the clawsrc file\n");
        @rclines = <SYLRC>;
 close SYLRC;
 

diff --git a/tools/multiwebsearch.pl b/tools/multiwebsearch.pl
index 933e31f..f893c0a 100644 (file)
--- a/tools/multiwebsearch.pl
+++ b/tools/multiwebsearch.pl
@@ -50,8 +50,8 @@ if (!$url) {
        die("No url found with the alias \"$where\"\n");
 } 
 
-open (SYLRC, "<sylpheedrc") 
-       || die("Can't open ~/.claws-mail/sylpheedrc\n");
+open (SYLRC, "<clawsrc") 
+       || die("Can't open ~/.claws-mail/clawsrc\n");
        @rclines = <SYLRC>;
 close SYLRC;