2006-11-27 [paul] 2.6.0cvs64
authorPaul Mangan <paul@claws-mail.org>
Mon, 27 Nov 2006 08:07:23 +0000 (08:07 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 27 Nov 2006 08:07:23 +0000 (08:07 +0000)
* Makefile.am
* configure.ac
* m4/aclocal-include.m4
* m4/check-type.m4
* src/Makefile.am
* src/addr_compl.c
* src/compose.c
* src/crash.c
* src/export.c
* src/exporthtml.c
* src/exportldif.c
* src/imap.c
* src/import.c
* src/main.c
* src/main.h
* src/matcher.c
* src/mimeview.c
* src/procmsg.c
* src/textview.c
* src/common/Makefile.am
* src/common/claws.c
* src/common/claws.h
* src/common/ssl.c
* src/common/sylpheed.c
* src/common/sylpheed.h
* src/etpan/Makefile.am
* src/gtk/Makefile.am
* src/gtk/claws-marshal.list
* src/gtk/filesel.c
* src/gtk/gtksctree.c
* src/gtk/quicksearch.c
* src/gtk/sylpheed-marshal.list
* src/plugins/bogofilter/bogofilter.c
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/clamav/clamav_plugin.c
* src/plugins/clamav/clamav_plugin_gtk.c
* src/plugins/demo/demo.c
* src/plugins/dillo_viewer/dillo_viewer.c
* src/plugins/pgpcore/Makefile.am
* src/plugins/pgpcore/claws.def
* src/plugins/pgpcore/pgp_viewer.c
* src/plugins/pgpcore/plugin.c
* src/plugins/pgpcore/sylpheed.def
* src/plugins/pgpinline/Makefile.am
* src/plugins/pgpinline/claws.def
* src/plugins/pgpinline/plugin.c
* src/plugins/pgpinline/sylpheed.def
* src/plugins/pgpmime/Makefile.am
* src/plugins/pgpmime/claws.def
* src/plugins/pgpmime/plugin.c
* src/plugins/pgpmime/sylpheed.def
* src/plugins/spamassassin/spamassassin.c
* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/trayicon/trayicon.c
yet more renaming
remove deprecated gtk_tooltips_set_delay()

50 files changed:
ChangeLog
Makefile.am
PATCHSETS
configure.ac
m4/aclocal-include.m4
m4/check-type.m4
src/Makefile.am
src/addr_compl.c
src/common/Makefile.am
src/common/claws.c [moved from src/common/sylpheed.c with 82% similarity]
src/common/claws.h [moved from src/common/sylpheed.h with 73% similarity]
src/common/ssl.c
src/compose.c
src/crash.c
src/etpan/Makefile.am
src/export.c
src/exporthtml.c
src/exportldif.c
src/gtk/Makefile.am
src/gtk/claws-marshal.list [moved from src/gtk/sylpheed-marshal.list with 100% similarity]
src/gtk/filesel.c
src/gtk/gtksctree.c
src/gtk/quicksearch.c
src/imap.c
src/import.c
src/main.c
src/main.h
src/matcher.c
src/mimeview.c
src/plugins/bogofilter/bogofilter.c
src/plugins/bogofilter/bogofilter_gtk.c
src/plugins/clamav/clamav_plugin.c
src/plugins/clamav/clamav_plugin_gtk.c
src/plugins/demo/demo.c
src/plugins/dillo_viewer/dillo_viewer.c
src/plugins/pgpcore/Makefile.am
src/plugins/pgpcore/claws.def [moved from src/plugins/pgpcore/sylpheed.def with 97% similarity]
src/plugins/pgpcore/pgp_viewer.c
src/plugins/pgpcore/plugin.c
src/plugins/pgpinline/Makefile.am
src/plugins/pgpinline/claws.def [moved from src/plugins/pgpinline/sylpheed.def with 95% similarity]
src/plugins/pgpinline/plugin.c
src/plugins/pgpmime/Makefile.am
src/plugins/pgpmime/claws.def [moved from src/plugins/pgpmime/sylpheed.def with 94% similarity]
src/plugins/pgpmime/plugin.c
src/plugins/spamassassin/spamassassin.c
src/plugins/spamassassin/spamassassin_gtk.c
src/plugins/trayicon/trayicon.c
src/procmsg.c
src/textview.c

index 8e0688a..d186505 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+2006-11-27 [paul]      2.6.0cvs64
+
+       * Makefile.am
+       * configure.ac
+       * m4/aclocal-include.m4
+       * m4/check-type.m4
+       * src/Makefile.am
+       * src/addr_compl.c
+       * src/compose.c
+       * src/crash.c
+       * src/export.c
+       * src/exporthtml.c
+       * src/exportldif.c
+       * src/imap.c
+       * src/import.c
+       * src/main.c
+       * src/main.h
+       * src/matcher.c
+       * src/mimeview.c
+       * src/procmsg.c
+       * src/textview.c
+       * src/common/Makefile.am
+       * src/common/claws.c
+       * src/common/claws.h
+       * src/common/ssl.c
+       * src/common/sylpheed.c
+       * src/common/sylpheed.h
+       * src/etpan/Makefile.am
+       * src/gtk/Makefile.am
+       * src/gtk/claws-marshal.list
+       * src/gtk/filesel.c
+       * src/gtk/gtksctree.c
+       * src/gtk/quicksearch.c
+       * src/gtk/sylpheed-marshal.list
+       * src/plugins/bogofilter/bogofilter.c
+       * src/plugins/bogofilter/bogofilter_gtk.c
+       * src/plugins/clamav/clamav_plugin.c
+       * src/plugins/clamav/clamav_plugin_gtk.c
+       * src/plugins/demo/demo.c
+       * src/plugins/dillo_viewer/dillo_viewer.c
+       * src/plugins/pgpcore/Makefile.am
+       * src/plugins/pgpcore/claws.def
+       * src/plugins/pgpcore/pgp_viewer.c
+       * src/plugins/pgpcore/plugin.c
+       * src/plugins/pgpcore/sylpheed.def
+       * src/plugins/pgpinline/Makefile.am
+       * src/plugins/pgpinline/claws.def
+       * src/plugins/pgpinline/plugin.c
+       * src/plugins/pgpinline/sylpheed.def
+       * src/plugins/pgpmime/Makefile.am
+       * src/plugins/pgpmime/claws.def
+       * src/plugins/pgpmime/plugin.c
+       * src/plugins/pgpmime/sylpheed.def
+       * src/plugins/spamassassin/spamassassin.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+       * src/plugins/trayicon/trayicon.c
+               yet more renaming
+               remove deprecated gtk_tooltips_set_delay()
+
 2006-11-26 [paul]      2.6.0cvs63
 
        * src/expldifdlg.c
index c156cd8..adf627e 100644 (file)
@@ -20,7 +20,7 @@ EXTRA_DIST = \
        claws-mail.png \
        autogen.sh
 
-if SYLPHEED_GNOME2
+if CLAWS_GNOME2
 # hicolor icon theme, base class of all icon themes
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
 pixmap_DATA=claws-mail.png
@@ -41,7 +41,7 @@ install-data-hook:
         fi
 
 else
-if SYLPHEED_GNOME
+if CLAWS_GNOME
 pixmapdir=$(gnomedatadir)/pixmaps
 pixmap_DATA=claws-mail.png
 gnomapdir=$(gnomedatadir)/gnome/apps/Internet
@@ -57,6 +57,6 @@ endif
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = claws-mail.pc
 
-sylpheedincludedir = $(pkgincludedir)
-sylpheedinclude_HEADERS = \
+clawsincludedir = $(pkgincludedir)
+clawsinclude_HEADERS = \
        config.h
index e2ca48f..f21b33a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.335 -r 1.382.2.336 src/compose.c;  cvs diff -u -r 1.207.2.134 -r 1.207.2.135 src/folderview.c;  cvs diff -u -r 1.149.2.62 -r 1.149.2.63 src/inc.c;  cvs diff -u -r 1.395.2.268 -r 1.395.2.269 src/summaryview.c;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/pgpcore/passphrase.c;  ) > 2.6.0cvs61.patchset
 ( cvs diff -u -r 1.27.2.24 -r 1.27.2.25 src/addr_compl.c;  cvs diff -u -r 1.60.2.69 -r 1.60.2.70 src/addressbook.c;  cvs diff -u -r 1.2.4.13 -r 1.2.4.14 src/browseldap.c;  ) > 2.6.0cvs62.patchset
 ( cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/expldifdlg.c;  cvs diff -u -r 1.207.2.135 -r 1.207.2.136 src/folderview.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/image_viewer.c;  cvs diff -u -r 1.274.2.156 -r 1.274.2.157 src/mainwindow.c;  cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/gtk/gtkutils.c;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.12.2.29 -r 1.12.2.30 src/gtk/prefswindow.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.6.0cvs63.patchset
+( cvs diff -u -r 1.24.2.16 -r 1.24.2.17 Makefile.am;  cvs diff -u -r 1.654.2.2143 -r 1.654.2.2144 configure.ac;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 m4/aclocal-include.m4;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 m4/check-type.m4;  cvs diff -u -r 1.155.2.49 -r 1.155.2.50 src/Makefile.am;  cvs diff -u -r 1.27.2.25 -r 1.27.2.26 src/addr_compl.c;  cvs diff -u -r 1.382.2.336 -r 1.382.2.337 src/compose.c;  cvs diff -u -r 1.23.2.19 -r 1.23.2.20 src/crash.c;  cvs diff -u -r 1.8.2.21 -r 1.8.2.22 src/export.c;  cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/exporthtml.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/exportldif.c;  cvs diff -u -r 1.179.2.138 -r 1.179.2.139 src/imap.c;  cvs diff -u -r 1.13.2.19 -r 1.13.2.20 src/import.c;  cvs diff -u -r 1.115.2.113 -r 1.115.2.114 src/main.c;  cvs diff -u -r 1.7.2.5 -r 1.7.2.6 src/main.h;  cvs diff -u -r 1.75.2.32 -r 1.75.2.33 src/matcher.c;  cvs diff -u -r 1.83.2.92 -r 1.83.2.93 src/mimeview.c;  cvs diff -u -r 1.150.2.83 -r 1.150.2.84 src/procmsg.c;  cvs diff -u -r 1.96.2.158 -r 1.96.2.159 src/textview.c;  cvs diff -u -r 1.24.2.10 -r 1.24.2.11 src/common/Makefile.am;  diff -u /dev/null src/common/claws.c;  diff -u /dev/null src/common/claws.h;  cvs diff -u -r 1.9.2.16 -r 1.9.2.17 src/common/ssl.c;  cvs diff -u -r -1.7.2.10 -r -1.7.2.11 src/common/sylpheed.c;  cvs diff -u -r -1.5.2.4 -r -1.5.2.5 src/common/sylpheed.h;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/etpan/Makefile.am;  cvs diff -u -r 1.20.2.10 -r 1.20.2.11 src/gtk/Makefile.am;  diff -u /dev/null src/gtk/claws-marshal.list;  cvs diff -u -r 1.2.2.26 -r 1.2.2.27 src/gtk/filesel.c;  cvs diff -u -r 1.1.4.35 -r 1.1.4.36 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.2.52 -r 1.1.2.53 src/gtk/quicksearch.c;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/gtk/sylpheed-marshal.list;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.9.2.21 -r 1.9.2.22 src/plugins/clamav/clamav_plugin_gtk.c;  cvs diff -u -r 1.13.2.10 -r 1.13.2.11 src/plugins/demo/demo.c;  cvs diff -u -r 1.12.2.16 -r 1.12.2.17 src/plugins/dillo_viewer/dillo_viewer.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpcore/Makefile.am;  diff -u /dev/null src/plugins/pgpcore/claws.def;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/pgp_viewer.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpcore/plugin.c;  cvs diff -u -r -1.1.2.5 -r -1.1.2.6 src/plugins/pgpcore/sylpheed.def;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpinline/Makefile.am;  diff -u /dev/null src/plugins/pgpinline/claws.def;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpinline/plugin.c;  cvs diff -u -r -1.1.2.6 -r -1.1.2.7 src/plugins/pgpinline/sylpheed.def;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpmime/Makefile.am;  diff -u /dev/null src/plugins/pgpmime/claws.def;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpmime/plugin.c;  cvs diff -u -r -1.1.2.5 -r -1.1.2.6 src/plugins/pgpmime/sylpheed.def;  cvs diff -u -r 1.18.2.43 -r 1.18.2.44 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.23.2.31 -r 1.23.2.32 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.14.2.44 -r 1.14.2.45 src/plugins/trayicon/trayicon.c;  ) > 2.6.0cvs64.patchset
index 833b509..699b448 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=63
+EXTRA_VERSION=64
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -47,11 +47,11 @@ if test "$GNOME_CONFIG" != no; then
        fi
        AC_SUBST(gnomedatadir)
 fi
-AM_CONDITIONAL(SYLPHEED_GNOME, test -n "$gnomedatadir")
+AM_CONDITIONAL(CLAWS_GNOME, test -n "$gnomedatadir")
 
 dnl GNOME 2.x installed?
 PKG_CHECK_MODULES(GNOME2, libgnome-2.0 >= 2.0, ac_enable_gnome2=yes, ac_enable_gnome2=no)
-AM_CONDITIONAL(SYLPHEED_GNOME2, test x"$ac_enable_gnome2" = x"yes")
+AM_CONDITIONAL(CLAWS_GNOME2, test x"$ac_enable_gnome2" = x"yes")
 
 dnl Claws version
 AC_DEFINE(CLAWS, 1, Compiling Claws branch of sylpheed)
@@ -87,7 +87,7 @@ AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_RC
 AC_PROG_LIBTOOL
 
-SYLPHEED_ACLOCAL_INCLUDE(m4)
+CLAWS_ACLOCAL_INCLUDE(m4)
   
 dnl ******************************
 dnl Checks for host
@@ -284,7 +284,7 @@ AC_STRUCT_TM
 dnl AC_CHECK_TYPE(wint_t, unsigned int) does not work because wint_t
 dnl may be defined only in wchar.h (this happens with gcc-2.96).
 dnl So we need to use this extended macro.
-SYLPHEED_CHECK_TYPE(wint_t, unsigned int,
+CLAWS_CHECK_TYPE(wint_t, unsigned int,
 [
 #if HAVE_WCHAR_H
 #include <wchar.h>
@@ -808,7 +808,7 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
 else
        AC_MSG_RESULT(no)
 fi
-AM_CONDITIONAL(SYLPHEED_LIBETPAN, test "x$libetpan_result" = "xyes")
+AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
 
 
 dnl Libgnomeprint
@@ -830,7 +830,7 @@ if test x$ac_cv_enable_gnomeprint = xyes; then
 else
        AC_MSG_RESULT(no)
 fi
-AM_CONDITIONAL(SYLPHEED_GNOMEPRINT, test x"$ac_cv_enable_gnomeprint" = x"yes")
+AM_CONDITIONAL(CLAWS_GNOMEPRINT, test x"$ac_cv_enable_gnomeprint" = x"yes")
 
 dnl ****************************
 dnl ** Final configure output **
index aac5f8a..443387a 100644 (file)
@@ -3,8 +3,8 @@
 # This macro adds the name macrodir to the set of directories
 # that `aclocal' searches for macros.
 
-dnl SYLPHEED_ACLOCAL_INCLUDE(macrodir)
-AC_DEFUN([SYLPHEED_ACLOCAL_INCLUDE],
+dnl CLAWS_ACLOCAL_INCLUDE(macrodir)
+AC_DEFUN([CLAWS_ACLOCAL_INCLUDE],
 [
        test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
index e65ea03..56dddd4 100644 (file)
@@ -1,14 +1,14 @@
-dnl SYLPHEED_CHECK_TYPE(TYPE, DEFAULT [, INCLUDES, COMMENT])
+dnl CLAWS_CHECK_TYPE(TYPE, DEFAULT [, INCLUDES, COMMENT])
 dnl
 dnl Like AC_CHECK_TYPE, but in addition to `sys/types.h', `stdlib.h' and
 dnl `stddef.h' checks files included by INCLUDES, which should be a
 dnl series of #include statements.  If TYPE is not defined, define it
 dnl to DEFAULT.
 dnl
-AC_DEFUN([SYLPHEED_CHECK_TYPE],
+AC_DEFUN([CLAWS_CHECK_TYPE],
 [AC_REQUIRE([AC_HEADER_STDC])dnl
 AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(sylpheed_cv_type_$1,
+AC_CACHE_VAL(claws_cv_type_$1,
 [AC_TRY_COMPILE([
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -19,9 +19,9 @@ $3
 ], [
 #undef $1
 int a = sizeof($1);
-], sylpheed_cv_type_$1=yes, sylpheed_cv_type_$1=no)])dnl
-AC_MSG_RESULT($sylpheed_cv_type_$1)
-if test $sylpheed_cv_type_$1 = no; then
+], claws_cv_type_$1=yes, claws_cv_type_$1=no)])dnl
+AC_MSG_RESULT($claws_cv_type_$1)
+if test $claws_cv_type_$1 = no; then
   AC_DEFINE($1, $2, $4)
 fi
 ])
index 437a4e0..735beaf 100644 (file)
@@ -1,7 +1,7 @@
 
-if SYLPHEED_LIBETPAN
+if CLAWS_LIBETPAN
 etpan_dir = etpan
-etpan_library = etpan/libsylpheedetpan.la
+etpan_library = etpan/libclawsetpan.la
 else
 etpan_dir =
 etpan_library = 
@@ -425,7 +425,7 @@ claws_mail_LDFLAGS = \
 
 claws_mail_LDADD = \
        $(etpan_library) \
-       gtk/libsylpheedgtk.la \
+       gtk/libclawsgtk.la \
        $(ASPELL_LIBS) \
        $(INTLLIBS) \
        $(GTK_LIBS) \
@@ -468,7 +468,7 @@ claws-mail$(EXEEXT): $(claws_mail_OBJECTS) $(claws_mail_DEPENDENCIES)
        @rm -f claws-mail$(EXEEXT)
        @rm -f claws-mail.def claws-mail.base claws-mail.exp libclaws-mail.a .libs/libclaws-mail.a
        $(LINK) -shared $(claws_mailLDFLAGS) -Wl,--out-implib=libclaws-mail.a -Wl,--export-all-symbols,--exclude-symbols,main $(claws_mail_OBJECTS) -Wl,--no-whole-archive $(claws_mail_LDADD) $(LIBS)
-       dlltool --output-def claws-mail.def --dllname claws-mail$(EXEEXT) --export-all-symbols --exclude-symbols main $(claws_mail_OBJECTS) gtk/.libs/libsylpheedgtk.a
+       dlltool --output-def claws-mail.def --dllname claws-mail$(EXEEXT) --export-all-symbols --exclude-symbols main $(claws_mail_OBJECTS) gtk/.libs/libclawsgtk.a
        $(LINK) $(claws_mail_LDFLAGS) -Wl,--base-file,claws-mail.base $(claws_mail_OBJECTS) $(claws_mail_LDADD) $(LIBS)
        sleep 5
        dlltool --base-file claws-mail.base --input-def claws-mail.def --output-exp claws-mail.exp
index e461328..d4d7cea 100644 (file)
@@ -46,7 +46,7 @@
 #include "addr_compl.h"
 #include "utils.h"
 #include "prefs_common.h"
-#include "sylpheed.h"
+#include "claws.h"
 #include <pthread.h>
 
 /*!
@@ -661,7 +661,7 @@ static guint _completionIdleID_ = 0;
 
 /*
  * address completion entry ui. the ui (completion list was inspired by galeon's
- * auto completion list). remaining things powered by sylpheed's completion engine.
+ * auto completion list). remaining things powered by claws's completion engine.
  */
 
 #define ENTRY_DATA_TAB_HOOK    "tab_hook"      /* used to lookup entry */
@@ -909,7 +909,7 @@ static gboolean addrcompl_idle( gpointer data ) {
                _displayQueue_ = NULL;
        }
        pthread_mutex_unlock( & _completionMutex_ );
-       sylpheed_do_idle();
+       claws_do_idle();
 
        return TRUE;
 }
index c275ab0..e49f5fb 100644 (file)
@@ -1,5 +1,5 @@
 PLUGINDIR = $(pkglibdir)/plugins/
-noinst_LTLIBRARIES = libsylpheedcommon.la
+noinst_LTLIBRARIES = libclawscommon.la
 
 if OS_WIN32
 arch_sources = fnmatch.c \
@@ -12,7 +12,7 @@ arch_files =
 arch_header = 
 endif
 
-libsylpheedcommon_la_SOURCES = $(arch_sources) \
+libclawscommon_la_SOURCES = $(arch_sources) \
        base64.c \
        hooks.c \
        log.c \
@@ -31,15 +31,15 @@ libsylpheedcommon_la_SOURCES = $(arch_sources) \
        ssl_certificate.c \
        string_match.c \
        stringtable.c \
-       sylpheed.c \
+       claws.c \
        template.c \
        utils.c \
        uuencode.c \
        xml.c \
        xmlprops.c
 
-sylpheedcommonincludedir = $(pkgincludedir)/common
-sylpheedcommoninclude_HEADERS = $(arch_headers) \
+clawscommonincludedir = $(pkgincludedir)/common
+clawscommoninclude_HEADERS = $(arch_headers) \
        base64.h \
        defs.h \
        hooks.h \
@@ -59,7 +59,7 @@ sylpheedcommoninclude_HEADERS = $(arch_headers) \
        ssl.h \
        string_match.h \
        stringtable.h \
-       sylpheed.h \
+       claws.h \
        template.h \
        timing.h \
        utils.h \
@@ -77,7 +77,7 @@ AM_CPPFLAGS = \
        -DLOCALEDIR=\""$(localedir)"\" \
        -DPLUGINDIR=\"$(PLUGINDIR)\" 
 
-libsylpheedcommon_la_LIBADD = \
+libclawscommon_la_LIBADD = \
        $(GLIB_LIBS) \
        $(OPENSSL_LIBS) \
        $(CRYPT_LIBS) \
similarity index 82%
rename from src/common/sylpheed.c
rename to src/common/claws.c
index 9b955dd..6f372d4 100644 (file)
 #  include <locale.h>
 #endif
 
-#include "sylpheed.h"
+#include "claws.h"
 #include "utils.h"
 #include "ssl.h"
 #include "version.h"
 
-static gboolean sylpheed_initialized = FALSE;
+static gboolean claws_initialized = FALSE;
 static gchar *startup_dir;
-static void (*sylpheed_idle_function)(void) = NULL;
+static void (*claws_idle_function)(void) = NULL;
 
 /**
  * Parse program parameters and remove all parameters
@@ -86,16 +86,16 @@ static void parse_parameter(int *argc, char ***argv)
        }
 }
 
-gboolean sylpheed_init(int *argc, char ***argv)
+gboolean claws_init(int *argc, char ***argv)
 {
-       if (sylpheed_initialized)
+       if (claws_initialized)
                return TRUE;
 
        startup_dir = g_get_current_dir();
 
        parse_parameter(argc, argv);
 
-       debug_print("Starting sylpheed version %08x\n", VERSION_NUMERIC);
+       debug_print("Starting Claws Mail version %08x\n", VERSION_NUMERIC);
 
        setlocale(LC_ALL, "");
 #ifdef ENABLE_NLS
@@ -119,12 +119,12 @@ gboolean sylpheed_init(int *argc, char ***argv)
        ssl_init();
 #endif
 
-       sylpheed_initialized = TRUE;
+       claws_initialized = TRUE;
 
        return TRUE;
 }
 
-void sylpheed_done(void)
+void claws_done(void)
 {
 
 #if USE_OPENSSL
@@ -132,23 +132,23 @@ void sylpheed_done(void)
 #endif
 }
 
-const gchar *sylpheed_get_startup_dir(void)
+const gchar *claws_get_startup_dir(void)
 {
        return startup_dir;
 }
 
-guint sylpheed_get_version(void)
+guint claws_get_version(void)
 {
        return VERSION_NUMERIC;
 }
 
-void sylpheed_register_idle_function   (void (*idle_func)(void))
+void claws_register_idle_function      (void (*idle_func)(void))
 {
-       sylpheed_idle_function = idle_func;
+       claws_idle_function = idle_func;
 }
 
-void sylpheed_do_idle(void)
+void claws_do_idle(void)
 {
-       if (sylpheed_idle_function != NULL)
-               sylpheed_idle_function();
+       if (claws_idle_function != NULL)
+               claws_idle_function();
 }
similarity index 73%
rename from src/common/sylpheed.h
rename to src/common/claws.h
index 7849187..09cb8aa 100644 (file)
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef SYLPHEED_H
-#define SYLPHEED_H
+#ifndef CLAWS_H
+#define CLAWS_H
 
 #include <glib.h>
 
-gboolean sylpheed_init                 (int *argc, char ***argv);
-void sylpheed_done                     (void);
-const gchar *sylpheed_get_startup_dir  (void);
-guint sylpheed_get_version             (void);
-void sylpheed_register_idle_function   (void (*idle_func)(void));
-void sylpheed_do_idle                  (void);
+gboolean claws_init                    (int *argc, char ***argv);
+void claws_done                                (void);
+const gchar *claws_get_startup_dir     (void);
+guint claws_get_version                        (void);
+void claws_register_idle_function      (void (*idle_func)(void));
+void claws_do_idle                     (void);
 
-#endif /* SYLPHEED_H */
+#endif /* CLAWS_H */
index 23d954e..ff5e244 100644 (file)
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include "sylpheed.h"
+#include "claws.h"
 #include "utils.h"
 #include "ssl.h"
 #include "ssl_certificate.h"
@@ -120,7 +120,7 @@ gint SSL_connect_nb(SSL *ssl)
        debug_print("waiting for SSL_connect thread...\n");
        while(!td->done) {
                /* don't let the interface freeze while waiting */
-               sylpheed_do_idle();
+               claws_do_idle();
                if (time(NULL) - start_time > 30) {
                        pthread_cancel(pt);
                        td->done = TRUE;
index a90aefb..01c9bb5 100644 (file)
@@ -81,7 +81,7 @@
 #  include <wctype.h>
 #endif
 
-#include "sylpheed.h"
+#include "claws.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "compose.h"
index 401d859..98b14e9 100644 (file)
@@ -49,7 +49,7 @@
 #ifdef SIGTERM
 #include "main.h"
 #endif
-#include "sylpheed.h"
+#include "claws.h"
 #include "crash.h"
 #include "utils.h"
 #include "filesel.h"
@@ -57,7 +57,7 @@
 #include "prefs_common.h"
 
 /*
- * NOTE: the crash dialog is called when sylpheed is not 
+ * NOTE: the crash dialog is called when claws is not 
  * initialized, so do not assume settings are available.
  * for example, loading / creating pixmaps seems not 
  * to be possible.
@@ -282,7 +282,7 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
 
 
 /*!
- *\brief       create debugger script file in sylpheed directory.
+ *\brief       create debugger script file in claws directory.
  *             all the other options (creating temp files) looked too 
  *             convoluted.
  */
@@ -322,7 +322,7 @@ static void crash_create_bug_report(GtkButton *button, const gchar *data)
 }
 
 /*!
- *\brief       launches debugger and attaches it to crashed sylpheed
+ *\brief       launches debugger and attaches it to crashed claws
  */
 static void crash_debug(unsigned long crash_pid, 
                        gchar *exe_image,
@@ -342,7 +342,7 @@ static void crash_debug(unsigned long crash_pid,
                setuid(getuid());
 
                /*
-                * setup debugger to attach to crashed sylpheed
+                * setup debugger to attach to crashed claws
                 */
                *argptr++ = "gdb"; 
                *argptr++ = "--nw";
@@ -537,7 +537,7 @@ static void crash_handler(int sig)
                args[3] = buf;
                args[4] = NULL;
 
-               chdir(sylpheed_get_startup_dir());
+               chdir(claws_get_startup_dir());
                setgid(getgid());
                setuid(getuid());
                execvp(argv0, args);
index a4cbbaa..2b62744 100644 (file)
@@ -1,14 +1,14 @@
 PLUGINDIR = $(pkglibdir)/plugins/
 
-noinst_LTLIBRARIES = libsylpheedetpan.la
+noinst_LTLIBRARIES = libclawsetpan.la
 
-libsylpheedetpan_la_SOURCES = \
+libclawsetpan_la_SOURCES = \
        etpan-thread-manager.c \
        etpan-log.c \
        imap-thread.c
 
-sylpheedetpanincludedir = $(pkgincludedir)/etpan
-sylpheedetpaninclude_HEADERS = \
+clawsetpanincludedir = $(pkgincludedir)/etpan
+clawsetpaninclude_HEADERS = \
        etpan-thread-manager-types.h \
        etpan-thread-manager.h \
        etpan-errors.h \
@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(LIBETPAN_CFLAGS) 
 
-libsylpheedetpan_la_LIBADD = \
-       ../common/libsylpheedcommon.la \
+libclawsetpan_la_LIBADD = \
+       ../common/libclawscommon.la \
        $(GTK_LIBS) \
        $(LIBETPAN_LIBS)
index 480fc1a..993d2da 100644 (file)
@@ -38,7 +38,7 @@
 #include <gtk/gtkfilesel.h>
 #include <gtk/gtksignal.h>
 
-#include "sylpheed.h"
+#include "claws.h"
 #include "main.h"
 #include "inc.h"
 #include "mbox.h"
@@ -82,7 +82,7 @@ gint export_mbox(FolderItem *default_src)
                gtk_widget_show(window);
        }
 
-       change_dir(sylpheed_get_startup_dir());
+       change_dir(claws_get_startup_dir());
 
        if (default_src && default_src->path) {
                src_id = folder_item_get_identifier(default_src);
index f93cd6a..6ae4294 100644 (file)
@@ -43,8 +43,8 @@
 #define mkdir(a,b) mkdir(a)
 #endif
 
-#define DFL_DIR_SYLPHEED_OUT  "sylpheed-out"
-#define DFL_FILE_SYLPHEED_OUT "addressbook.html"
+#define DFL_DIR_CLAWS_OUT  "claws-mail-out"
+#define DFL_FILE_CLAWS_OUT "addressbook.html"
 
 #define FMT_BUFSIZE         2048
 #define SC_HTML_SPACE          "&nbsp;"
@@ -55,7 +55,7 @@
 
 /* Stylesheet names */
 #define FILENAME_NONE       ""
-#define FILENAME_DEFAULT    "sylpheed.css"
+#define FILENAME_DEFAULT    "claws-mail.css"
 #define FILENAME_FULL       "full.css"
 #define FILENAME_CUSTOM     "custom.css"
 #define FILENAME_CUSTOM2    "custom2.css"
@@ -1144,13 +1144,13 @@ static void exporthtml_default_values( ExportHtmlCtl *ctl ) {
 
        str = g_strconcat(
                get_home_dir(), G_DIR_SEPARATOR_S,
-               DFL_DIR_SYLPHEED_OUT, NULL );
+               DFL_DIR_CLAWS_OUT, NULL );
 
        ctl->dirOutput = mgu_replace_string( ctl->dirOutput, str );
        g_free( str );
 
        ctl->fileHtml =
-               mgu_replace_string( ctl->fileHtml, DFL_FILE_SYLPHEED_OUT );
+               mgu_replace_string( ctl->fileHtml, DFL_FILE_CLAWS_OUT );
        ctl->encoding = NULL;
        ctl->stylesheet = EXPORT_HTML_ID_DEFAULT;
        ctl->nameFormat = EXPORT_HTML_FIRST_LAST;
index c2bad7a..33ce0be 100644 (file)
@@ -44,8 +44,8 @@
 #define mkdir(a,b) mkdir(a)
 #endif
 
-#define DFL_DIR_SYLPHEED_OUT  "sylpheed-out"
-#define DFL_FILE_SYLPHEED_OUT "addressbook.ldif"
+#define DFL_DIR_CLAWS_OUT  "claws-mail-out"
+#define DFL_FILE_CLAWS_OUT "addressbook.ldif"
 
 #define FMT_BUFSIZE           2048
 #define XML_BUFSIZE           2048
@@ -621,13 +621,13 @@ static void exportldif_default_values( ExportLdifCtl *ctl ) {
 
        str = g_strconcat(
                get_home_dir(), G_DIR_SEPARATOR_S,
-               DFL_DIR_SYLPHEED_OUT, NULL );
+               DFL_DIR_CLAWS_OUT, NULL );
 
        ctl->dirOutput = mgu_replace_string( ctl->dirOutput, str );
        g_free( str );
 
        ctl->fileLdif =
-               mgu_replace_string( ctl->fileLdif, DFL_FILE_SYLPHEED_OUT );
+               mgu_replace_string( ctl->fileLdif, DFL_FILE_CLAWS_OUT );
        ctl->suffix = mgu_replace_string( ctl->suffix, "" );
 
        ctl->rdnIndex = EXPORT_LDIF_ID_UID;
index 686f636..9ce7716 100644 (file)
@@ -1,11 +1,11 @@
 PLUGINDIR = $(pkglibdir)/plugins/
 
-noinst_LTLIBRARIES = libsylpheedgtk.la
+noinst_LTLIBRARIES = libclawsgtk.la
 
 EXTRA_DIST = \
-       sylpheed-marshal.list
+       claws-marshal.list
 
-libsylpheedgtk_la_SOURCES = \
+libclawsgtk_la_SOURCES = \
        about.c \
        colorlabel.c \
        colorsel.c \
@@ -30,10 +30,10 @@ libsylpheedgtk_la_SOURCES = \
        progressdialog.c \
        quicksearch.c \
        sslcertwindow.c \
-       sylpheed-marshal.c
+       claws-marshal.c
 
-sylpheedgtkincludedir = $(pkgincludedir)/gtk
-sylpheedgtkinclude_HEADERS = \
+clawsgtkincludedir = $(pkgincludedir)/gtk
+clawsgtkinclude_HEADERS = \
        about.h \
        authors.h \
        colorlabel.h \
@@ -60,7 +60,7 @@ sylpheedgtkinclude_HEADERS = \
        progressdialog.h \
        quicksearch.h \
        sslcertwindow.h \
-       sylpheed-marshal.h
+       claws-marshal.h
 
 AM_CPPFLAGS = \
        -I$(srcdir)/../common \
@@ -71,16 +71,16 @@ AM_CPPFLAGS = \
        $(GNOMEPRINT_CFLAGS) \
        -DPLUGINDIR=\"$(PLUGINDIR)\" 
 
-libsylpheedgtk_la_LIBADD = \
-       ../common/libsylpheedcommon.la \
+libclawsgtk_la_LIBADD = \
+       ../common/libclawscommon.la \
        $(GTK_LIBS) \
        $(ASPELL_LIBS) \
        $(GNOMEPRINT_LIBS)
 
-BUILT_SOURCES=sylpheed-marshal.c sylpheed-marshal.h 
+BUILT_SOURCES=claws-marshal.c claws-marshal.h 
 
-sylpheed-marshal.h: sylpheed-marshal.list
-       $(GLIB_GENMARSHAL) $< --header --prefix=sylpheed_marshal > $@
+claws-marshal.h: claws-marshal.list
+       $(GLIB_GENMARSHAL) $< --header --prefix=claws_marshal > $@
 
-sylpheed-marshal.c: sylpheed-marshal.list
-       $(GLIB_GENMARSHAL) $< --body --prefix=sylpheed_marshal > $@
+claws-marshal.c: claws-marshal.list
+       $(GLIB_GENMARSHAL) $< --body --prefix=claws_marshal > $@
index 0fc86d6..2c309a1 100644 (file)
@@ -34,7 +34,7 @@
 #include <gtk/gtkfilechooser.h>
 #include <gtk/gtkfilechooserdialog.h>
 
-#include "sylpheed.h"
+#include "claws.h"
 #include "filesel.h"
 #include "manage_window.h"
 #include "gtkutils.h"
index 4259e24..e9f1013 100644 (file)
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 
 #include "gtksctree.h"
-#include "sylpheed-marshal.h"
+#include "claws-marshal.h"
 #include "stock_pixmap.h"
 #include "prefs_common.h"
 #include "utils.h"
@@ -1326,7 +1326,7 @@ gtk_sctree_class_init (GtkSCTreeClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (GtkSCTreeClass, row_popup_menu),
                              NULL, NULL,
-                             sylpheed_marshal_VOID__POINTER,
+                             claws_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              GDK_TYPE_EVENT);
        sctree_signals[EMPTY_POPUP_MENU] =
@@ -1335,7 +1335,7 @@ gtk_sctree_class_init (GtkSCTreeClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (GtkSCTreeClass, empty_popup_menu),
                              NULL, NULL,
-                             sylpheed_marshal_VOID__POINTER,
+                             claws_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              GDK_TYPE_EVENT);
        sctree_signals[OPEN_ROW] =
@@ -1352,7 +1352,7 @@ gtk_sctree_class_init (GtkSCTreeClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (GtkSCTreeClass, start_drag),
                              NULL, NULL,
-                             sylpheed_marshal_VOID__INT_POINTER,
+                             claws_marshal_VOID__INT_POINTER,
                              G_TYPE_NONE, 2,
                              G_TYPE_INT,
                              GDK_TYPE_EVENT);
index ef7a171..0a1b96c 100644 (file)
@@ -38,7 +38,7 @@
 #include "folderview.h"
 #include "folder.h"
 #include "prefs_matcher.h"
-#include "sylpheed.h"
+#include "claws.h"
 #include "statusbar.h"
 
 struct _QuickSearch
index 710b078..39f497a 100644 (file)
@@ -64,7 +64,7 @@
 #include "log.h"
 #include "remotefolder.h"
 #include "alertpanel.h"
-#include "sylpheed.h"
+#include "claws.h"
 #include "statusbar.h"
 #include "msgcache.h"
 #include "imap-thread.h"
@@ -389,7 +389,7 @@ static gchar *imap_item_get_path            (Folder         *folder,
 static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item);
 
 
-/* data types conversion libetpan <-> sylpheed */
+/* data types conversion libetpan <-> claws */
 static GSList * imap_list_from_lep(IMAPFolder * folder,
                                   clist * list, const gchar * real_path, gboolean all);
 static GSList * imap_get_lep_set_from_numlist(MsgNumberList *numlist);
@@ -4016,7 +4016,7 @@ static void imap_set_batch (Folder *folder, FolderItem *_item, gboolean batch)
 
 
 
-/* data types conversion libetpan <-> sylpheed */
+/* data types conversion libetpan <-> claws */
 
 
 
index 8edb255..2cfecd3 100644 (file)
@@ -38,7 +38,7 @@
 #include <gtk/gtkfilesel.h>
 #include <gtk/gtksignal.h>
 
-#include "sylpheed.h"
+#include "claws.h"
 #include "main.h"
 #include "inc.h"
 #include "mbox.h"
@@ -82,7 +82,7 @@ gint import_mbox(FolderItem *default_dest)
                gtk_widget_show(window);
        }
 
-       change_dir(sylpheed_get_startup_dir());
+       change_dir(claws_get_startup_dir());
 
        if (default_dest && default_dest->path) {
                dest_id = folder_item_get_identifier(default_dest);
index c30e681..ba7324a 100644 (file)
@@ -51,7 +51,7 @@
 # include <gdk/gdkx.h>
 #endif
 
-#include "sylpheed.h"
+#include "claws.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
@@ -170,7 +170,7 @@ static void send_queue                      (void);
 static void initial_processing         (FolderItem *item, gpointer data);
 static void quit_signal_handler         (int sig);
 static void install_basic_sighandlers   (void);
-static void exit_sylpheed              (MainWindow *mainwin);
+static void exit_claws                 (MainWindow *mainwin);
 
 #define MAKE_DIR_IF_NOT_EXIST(dir) \
 { \
@@ -234,7 +234,7 @@ static void startup_notification_complete(gboolean with_window)
 }
 #endif /* HAVE_STARTUP_NOTIFICATION */
 
-void sylpheed_gtk_idle(void) 
+void claws_gtk_idle(void) 
 {
        while(gtk_events_pending()) {
                gtk_main_iteration();
@@ -511,7 +511,7 @@ int main(int argc, char *argv[])
        gint num_folder_class = 0;
        START_TIMING("startup");
        
-       if (!sylpheed_init(&argc, &argv)) {
+       if (!claws_init(&argc, &argv)) {
                return 0;
        }
 
@@ -729,7 +729,7 @@ int main(int argc, char *argv[])
                        exit(1);
                account_read_config_all();
                if(!account_get_list())
-                       exit_sylpheed(mainwin);
+                       exit_claws(mainwin);
        }
 
        
@@ -747,11 +747,11 @@ int main(int argc, char *argv[])
 
        prefs_matcher_read_config();
 
-       /* make one all-folder processing before using sylpheed */
+       /* make one all-folder processing before using claws */
        main_window_cursor_wait(mainwin);
        folder_func_to_all_folders(initial_processing, (gpointer *)mainwin);
 
-       /* if Sylpheed crashed, rebuild caches */
+       /* if claws crashed, rebuild caches */
        if (!cmd.crash && crash_file_present) {
                GTK_EVENTS_FLUSH();
                debug_print("Claws Mail crashed, checking for new messages in local folders\n");
@@ -785,7 +785,7 @@ int main(int argc, char *argv[])
                cmd.status_full_folders = NULL;
        }
 
-       sylpheed_register_idle_function(sylpheed_gtk_idle);
+       claws_register_idle_function(claws_gtk_idle);
 
        prefs_toolbar_init();
 
@@ -865,7 +865,7 @@ int main(int argc, char *argv[])
        END_TIMING();
        gtk_main();
 
-       exit_sylpheed(mainwin);
+       exit_claws(mainwin);
 
        return 0;
 }
@@ -884,7 +884,7 @@ static void save_all_caches(FolderItem *item, gpointer data)
 
 static gboolean sc_exiting = FALSE;
 
-static void exit_sylpheed(MainWindow *mainwin)
+static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
 
@@ -967,7 +967,7 @@ static void exit_sylpheed(MainWindow *mainwin)
        gtkaspell_checkers_quit();
 #endif
        plugin_unload_all("Common");
-       sylpheed_done();
+       claws_done();
 }
 
 static void parse_cmd_opt(int argc, char *argv[])
@@ -1007,7 +1007,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                                        cmd.attach_files = g_ptr_array_new();
                                }
                                if (*p != G_DIR_SEPARATOR) {
-                                       file = g_strconcat(sylpheed_get_startup_dir(),
+                                       file = g_strconcat(claws_get_startup_dir(),
                                                           G_DIR_SEPARATOR_S,
                                                           p, NULL);
                                } else {
@@ -1190,7 +1190,7 @@ gboolean clean_quit(gpointer data)
                
        draft_all_messages();
        emergency_exit = TRUE;
-       exit_sylpheed(static_mainwindow);
+       exit_claws(static_mainwindow);
        exit(0);
 
        return FALSE;
@@ -1240,7 +1240,7 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        gtk_main_quit();
 }
 
-gboolean sylpheed_is_exiting(void)
+gboolean claws_is_exiting(void)
 {
        return sc_exiting;
 }
index 6495363..e68c3bf 100644 (file)
@@ -28,6 +28,6 @@ extern gboolean debug_mode;
 
 void app_will_exit     (GtkWidget *widget, gpointer data);
 gboolean clean_quit    (gpointer data);
-gboolean sylpheed_is_exiting(void);
+gboolean claws_is_exiting(void);
 
 #endif /* __MAIN_H__ */
index 2fd2537..21b91ee 100644 (file)
@@ -41,7 +41,7 @@
 #include "addr_compl.h"
 #include "codeconv.h"
 #include "quoted-printable.h"
-#include "sylpheed.h"
+#include "claws.h"
 #include <ctype.h>
 
 /*!
@@ -507,7 +507,7 @@ static gboolean matcherprop_match_test(const MatcherProp *prop,
                printf("waiting for test thread\n");
                while(!td->done) {
                        /* don't let the interface freeze while waiting */
-                       sylpheed_do_idle();
+                       claws_do_idle();
                        if (time(NULL) - start_time > 30) {
                                pthread_cancel(pt);
                                td->done = TRUE;
index 42f4a91..da4a9d0 100644 (file)
@@ -283,7 +283,6 @@ MimeView *mimeview_create(MainWindow *mainwin)
        popupmenu = menu_create_items(mimeview_popup_entries, n_entries,
                                      "<MimeView>", &popupfactory, mimeview);
        tooltips = gtk_tooltips_new();
-       gtk_tooltips_set_delay(tooltips, 0); 
 
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(vbox);
index 252fa67..2e422f1 100644 (file)
@@ -34,7 +34,7 @@
 #  include <locale.h>
 #endif
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "common/utils.h"
@@ -660,12 +660,12 @@ gint plugin_init(gchar **error)
 
        hook_id = -1;
 
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+       if ((claws_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup(_("Your version of Claws Mail is newer than the version the Bogofilter plugin was built with"));
                return -1;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+       if ((claws_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
                *error = g_strdup(_("Your version of Claws Mail is too old for the Bogofilter plugin"));
                return -1;
        }
index 58838d1..b5b6206 100644 (file)
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkutils.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "common/utils.h"
index 2367aa7..05ee9a2 100644 (file)
@@ -27,7 +27,7 @@
 #include <glib/gi18n.h>
 #include <clamav.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "utils.h"
@@ -194,12 +194,12 @@ gint plugin_init(gchar **error)
        int ret;
        unsigned int no;
 
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+       if ((claws_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup(_("Your version of Claws Mail is newer than the version the ClamAV plugin was built with"));
                return -1;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+       if ((claws_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
                *error = g_strdup(_("Your version of Claws Mail is too old for the ClamAV plugin"));
                return -1;
        }
index f31aafb..53bf51f 100644 (file)
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkutils.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "utils.h"
index d5171f4..0aa4542 100644 (file)
@@ -22,7 +22,7 @@
 
 
 #include "version.h"
-#include "sylpheed.h"
+#include "claws.h"
 #include "plugin.h"
 #include "utils.h"
 #include "hooks.h"
@@ -41,12 +41,12 @@ static guint hook_id;
 
 gint plugin_init(gchar **error)
 {
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+       if ((claws_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup(_("Your claws-mail version is newer than the version the plugin was built with"));
                return -1;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 8, 11, 39))) {
+       if ((claws_get_version() < MAKE_NUMERIC_VERSION(0, 8, 11, 39))) {
                *error = g_strdup(_("Your claws-mail version is too old"));
                return -1;
        }
index 4bab8cb..f18fa45 100644 (file)
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "utils.h"
@@ -165,12 +165,12 @@ static MimeViewerFactory dillo_viewer_factory =
 
 gint plugin_init(gchar **error)
 {
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+       if ((claws_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup(_("Your version of Claws Mail is newer than the version the Dillo plugin was built with"));
                return -1;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+       if ((claws_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
                *error = g_strdup(_("Your version of Claws Mail is too old for the Dillo plugin"));
                return -1;
        }
index 68a08e6..827a7a4 100644 (file)
@@ -1,4 +1,4 @@
-EXTRA_DIST = version.rc plugin.def sylpheed.def
+EXTRA_DIST = version.rc plugin.def claws.def
 
 if OS_WIN32
 
@@ -14,12 +14,12 @@ plugin_res_ldflag = -Wl,.libs/version.o
 
 export_symbols = -export-symbols $(srcdir)/plugin.def
 
-plugin_deps = libsylpheed.a $(plugin_res) plugin.def
+plugin_deps = libclaws.a $(plugin_res) plugin.def
 
-libsylpheed.a: sylpheed.def
+libclaws.a: claws.def
        $(DLLTOOL) --output-lib $@ --def $<
 
-plugin_ldadd = -L . -lsylpheed
+plugin_ldadd = -L . -lclaws
 
 else
 plugin_res =
@@ -81,5 +81,5 @@ AM_CPPFLAGS = \
        -Wno-deprecated-declarations
 
 clean-local:
-       rm -f libsylpheed.a
+       rm -f libclaws.a
 
similarity index 97%
rename from src/plugins/pgpcore/sylpheed.def
rename to src/plugins/pgpcore/claws.def
index 9ca2c27..a7fed85 100644 (file)
@@ -30,6 +30,6 @@ prefs_set_block_label
 prefs_set_default
 prefs_write_open
 prefs_write_param
-sylpheed_get_version
+claws_get_version
 privacy_set_error
 privacy_get_error
index b068f71..c89263f 100644 (file)
@@ -32,7 +32,7 @@
 #endif
 
 #include "version.h"
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "mainwindow.h"
 #include "mimeview.h"
 #include "textview.h"
index 2f6ab4d..03461e2 100644 (file)
@@ -26,7 +26,7 @@
 #include <glib/gi18n.h>
 
 #include "version.h"
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "sgpgme.h"
 #include "prefs_gpg.h"
 #include "pgp_viewer.h"
 
 gint plugin_init(gchar **error)
 {
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+       if ((claws_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup(_("Your version of Claws Mail is newer than the version the PGP/Core plugin was built with"));
                return -1;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) {
+       if ((claws_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) {
                *error = g_strdup(_("Your version of Claws Mail is too old for the PGP/Core plugin"));
                return -1;
        }
index 9636414..93efc6f 100644 (file)
@@ -1,4 +1,4 @@
-EXTRA_DIST = version.rc plugin.def sylpheed.def mypgpcore.def pgpinline.deps
+EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpinline.deps
 
 
 if OS_WIN32
@@ -15,15 +15,15 @@ plugin_res_ldflag = -Wl,.libs/version.o
 
 export_symbols = -export-symbols $(srcdir)/plugin.def
 
-plugin_deps = libsylpheed.a libmypgpcore.a $(plugin_res) plugin.def
+plugin_deps = libclaws.a libmypgpcore.a $(plugin_res) plugin.def
 
-libsylpheed.a: sylpheed.def
+libclaws.a: claws.def
        $(DLLTOOL) --output-lib $@ --def $<
 
 libmypgpcore.a: mypgpcore.def
        $(DLLTOOL) --output-lib $@ --def $<
 
-plugin_ldadd = -L . -lsylpheed  -lmypgpcore
+plugin_ldadd = -L . -lclaws  -lmypgpcore
 
 else
 plugin_res =
@@ -80,4 +80,4 @@ AM_CPPFLAGS = \
        -Wno-deprecated-declarations
 
 clean-local:
-       rm -f libsylpheed.a
+       rm -f libclaws.a
similarity index 95%
rename from src/plugins/pgpinline/sylpheed.def
rename to src/plugins/pgpinline/claws.def
index 8951522..2a13e76 100644 (file)
@@ -16,7 +16,7 @@ procmime_mimeinfo_get_parameter
 procmime_mimeinfo_parent
 procmime_scan_file
 procmime_write_mimeinfo
-sylpheed_get_version
+claws_get_version
 privacy_set_error
 privacy_get_error
 privacy_reset_error
index 03d8255..534e78e 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include "sylpheed.h"
+#include "claws.h"
 #include "version.h"
 #include "pgpinline.h"
 
 gint plugin_init(gchar **error)
 {
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+       if ((claws_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup(_("Your version of Claws Mail is newer than the version the PGP/inline plugin was built with"));
                return -1;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) {
+       if ((claws_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) {
                *error = g_strdup(_("Your version of Claws Mail is too old for the PGP/inline plugin"));
                return -1;
        }
index 4a93e21..1facc75 100644 (file)
@@ -1,4 +1,4 @@
-EXTRA_DIST = version.rc plugin.def sylpheed.def mypgpcore.def pgpmime.deps
+EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpmime.deps
 
 if OS_WIN32
 
@@ -14,15 +14,15 @@ plugin_res_ldflag = -Wl,.libs/version.o
 
 export_symbols = -export-symbols $(srcdir)/plugin.def
 
-plugin_deps = libsylpheed.a libmypgpcore.a $(plugin_res) plugin.def
+plugin_deps = libclaws.a libmypgpcore.a $(plugin_res) plugin.def
 
-libsylpheed.a: sylpheed.def
+libclaws.a: claws.def
        $(DLLTOOL) --output-lib $@ --def $<
 
 libmypgpcore.a: mypgpcore.def
        $(DLLTOOL) --output-lib $@ --def $<
 
-plugin_ldadd = -L . -lsylpheed -lmypgpcore
+plugin_ldadd = -L . -lclaws -lmypgpcore
 
 else
 plugin_res =
@@ -79,4 +79,4 @@ AM_CPPFLAGS = \
        -Wno-deprecated-declarations
 
 clean-local:
-       rm -f libsylpheed.a
+       rm -f libclaws.a
similarity index 94%
rename from src/plugins/pgpmime/sylpheed.def
rename to src/plugins/pgpmime/claws.def
index 20cfc9b..5aad56e 100644 (file)
@@ -15,6 +15,6 @@ procmime_mimeinfo_new
 procmime_mimeinfo_parent
 procmime_scan_file
 procmime_write_mimeinfo
-sylpheed_get_version
+claws_get_version
 privacy_set_error
 privacy_get_error
index 6407e2e..1800c53 100644 (file)
 #include <glib/gi18n.h>
 
 #include "version.h"
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "pgpmime.h"
 
 gint plugin_init(gchar **error)
 {
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+       if ((claws_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup(_("Your version of Claws Mail is newer than the version the PGP/MIME plugin was built with"));
                return -1;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) {
+       if ((claws_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) {
                *error = g_strdup(_("Your version of Claws Mail is too old for the PGP/MIME plugin"));
                return -1;
        }
index 3c7ba76..6864e33 100644 (file)
@@ -33,7 +33,7 @@
 #  include <locale.h>
 #endif
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "common/utils.h"
@@ -465,12 +465,12 @@ gint plugin_init(gchar **error)
 
        hook_id = -1;
 
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+       if ((claws_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup(_("Your version of Claws Mail is newer than the version the SpamAssassin plugin was built with"));
                return -1;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+       if ((claws_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
                *error = g_strdup(_("Your version of Claws Mail is too old for the SpamAssassin plugin"));
                return -1;
        }
index 1de487c..8e05008 100644 (file)
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkutils.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "common/utils.h"
index 2778e54..78cc4d6 100644 (file)
@@ -27,7 +27,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "utils.h"
@@ -335,7 +335,6 @@ static void create_trayicon()
                G_CALLBACK(click_cb), NULL);
 
        tooltips = gtk_tooltips_new();
-       gtk_tooltips_set_delay(tooltips, 1000);
        gtk_tooltips_enable(tooltips);
 
        n_entries = sizeof(trayicon_popup_menu_entries) /
@@ -351,12 +350,12 @@ static void create_trayicon()
 
 int plugin_init(gchar **error)
 {
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+       if ((claws_get_version() > VERSION_NUMERIC)) {
                *error = g_strdup(_("Your version of Claws Mail is newer than the version the Trayicon plugin was built with"));
                return -1;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+       if ((claws_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
                *error = g_strdup(_("Your version of Claws Mail is too old for the Trayicon plugin"));
                return -1;
        }
@@ -398,7 +397,7 @@ void plugin_done(void)
        hooks_unregister_hook(OFFLINE_SWITCH_HOOKLIST, offline_hook_id);
        hooks_unregister_hook(ACCOUNT_LIST_CHANGED_HOOKLIST, account_hook_id);
 
-       if (sylpheed_is_exiting())
+       if (claws_is_exiting())
                return;
 
        g_signal_handler_disconnect(G_OBJECT(trayicon), destroy_signal_id);
index 469ac08..5016fdb 100644 (file)
@@ -65,7 +65,7 @@ enum
        Q_PRIVACY_SYSTEM   = 9,
        Q_ENCRYPT          = 10,
        Q_ENCRYPT_DATA     = 11,
-       Q_SYLPHEED_HDRS    = 12,
+       Q_CLAWS_HDRS    = 12,
 };
 
 GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
@@ -1550,7 +1550,7 @@ static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_ses
                        if (encrypt_data == NULL) 
                                encrypt_data = g_strdup(p);
                        break;
-               case Q_SYLPHEED_HDRS:
+               case Q_CLAWS_HDRS:
                        /* end of special headers reached */
                        goto send_mail; /* can't "break;break;" */
                }
index 5852582..b03d861 100644 (file)
@@ -1022,7 +1022,7 @@ static void textview_show_html(TextView *textview, FILE *fp,
                if (parser->state == SC_HTML_HREF) {
                        /* first time : get and copy the URL */
                        if (parser->href == NULL) {
-                               /* ALF - the sylpheed html parser returns an empty string,
+                               /* ALF - the claws html parser returns an empty string,
                                 * if still inside an <a>, but already parsed past HREF */
                                str = strtok(str, " ");
                                if (str) {