+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
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
fi
else
-if SYLPHEED_GNOME
+if CLAWS_GNOME
pixmapdir=$(gnomedatadir)/pixmaps
pixmap_DATA=claws-mail.png
gnomapdir=$(gnomedatadir)/gnome/apps/Internet
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = claws-mail.pc
-sylpheedincludedir = $(pkgincludedir)
-sylpheedinclude_HEADERS = \
+clawsincludedir = $(pkgincludedir)
+clawsinclude_HEADERS = \
config.h
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=63
+EXTRA_VERSION=64
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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)
AC_LIBTOOL_RC
AC_PROG_LIBTOOL
-SYLPHEED_ACLOCAL_INCLUDE(m4)
+CLAWS_ACLOCAL_INCLUDE(m4)
dnl ******************************
dnl Checks for host
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>
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
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 **
# 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"
-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
], [
#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
])
-if SYLPHEED_LIBETPAN
+if CLAWS_LIBETPAN
etpan_dir = etpan
-etpan_library = etpan/libsylpheedetpan.la
+etpan_library = etpan/libclawsetpan.la
else
etpan_dir =
etpan_library =
claws_mail_LDADD = \
$(etpan_library) \
- gtk/libsylpheedgtk.la \
+ gtk/libclawsgtk.la \
$(ASPELL_LIBS) \
$(INTLLIBS) \
$(GTK_LIBS) \
@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
#include "addr_compl.h"
#include "utils.h"
#include "prefs_common.h"
-#include "sylpheed.h"
+#include "claws.h"
#include <pthread.h>
/*!
/*
* 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 */
_displayQueue_ = NULL;
}
pthread_mutex_unlock( & _completionMutex_ );
- sylpheed_do_idle();
+ claws_do_idle();
return TRUE;
}
PLUGINDIR = $(pkglibdir)/plugins/
-noinst_LTLIBRARIES = libsylpheedcommon.la
+noinst_LTLIBRARIES = libclawscommon.la
if OS_WIN32
arch_sources = fnmatch.c \
arch_header =
endif
-libsylpheedcommon_la_SOURCES = $(arch_sources) \
+libclawscommon_la_SOURCES = $(arch_sources) \
base64.c \
hooks.c \
log.c \
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 \
ssl.h \
string_match.h \
stringtable.h \
- sylpheed.h \
+ claws.h \
template.h \
timing.h \
utils.h \
-DLOCALEDIR=\""$(localedir)"\" \
-DPLUGINDIR=\"$(PLUGINDIR)\"
-libsylpheedcommon_la_LIBADD = \
+libclawscommon_la_LIBADD = \
$(GLIB_LIBS) \
$(OPENSSL_LIBS) \
$(CRYPT_LIBS) \
# 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
}
}
-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
ssl_init();
#endif
- sylpheed_initialized = TRUE;
+ claws_initialized = TRUE;
return TRUE;
}
-void sylpheed_done(void)
+void claws_done(void)
{
#if USE_OPENSSL
#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();
}
* 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 */
#include <glib.h>
#include <glib/gi18n.h>
-#include "sylpheed.h"
+#include "claws.h"
#include "utils.h"
#include "ssl.h"
#include "ssl_certificate.h"
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;
# include <wctype.h>
#endif
-#include "sylpheed.h"
+#include "claws.h"
#include "main.h"
#include "mainwindow.h"
#include "compose.h"
#ifdef SIGTERM
#include "main.h"
#endif
-#include "sylpheed.h"
+#include "claws.h"
#include "crash.h"
#include "utils.h"
#include "filesel.h"
#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.
/*!
- *\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.
*/
}
/*!
- *\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,
setuid(getuid());
/*
- * setup debugger to attach to crashed sylpheed
+ * setup debugger to attach to crashed claws
*/
*argptr++ = "gdb";
*argptr++ = "--nw";
args[3] = buf;
args[4] = NULL;
- chdir(sylpheed_get_startup_dir());
+ chdir(claws_get_startup_dir());
setgid(getgid());
setuid(getuid());
execvp(argv0, args);
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 \
$(GTK_CFLAGS) \
$(LIBETPAN_CFLAGS)
-libsylpheedetpan_la_LIBADD = \
- ../common/libsylpheedcommon.la \
+libclawsetpan_la_LIBADD = \
+ ../common/libclawscommon.la \
$(GTK_LIBS) \
$(LIBETPAN_LIBS)
#include <gtk/gtkfilesel.h>
#include <gtk/gtksignal.h>
-#include "sylpheed.h"
+#include "claws.h"
#include "main.h"
#include "inc.h"
#include "mbox.h"
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);
#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 " "
/* 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"
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;
#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
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;
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 \
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 \
progressdialog.h \
quicksearch.h \
sslcertwindow.h \
- sylpheed-marshal.h
+ claws-marshal.h
AM_CPPFLAGS = \
-I$(srcdir)/../common \
$(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 > $@
#include <gtk/gtkfilechooser.h>
#include <gtk/gtkfilechooserdialog.h>
-#include "sylpheed.h"
+#include "claws.h"
#include "filesel.h"
#include "manage_window.h"
#include "gtkutils.h"
#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"
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] =
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] =
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);
#include "folderview.h"
#include "folder.h"
#include "prefs_matcher.h"
-#include "sylpheed.h"
+#include "claws.h"
#include "statusbar.h"
struct _QuickSearch
#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"
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);
-/* data types conversion libetpan <-> sylpheed */
+/* data types conversion libetpan <-> claws */
#include <gtk/gtkfilesel.h>
#include <gtk/gtksignal.h>
-#include "sylpheed.h"
+#include "claws.h"
#include "main.h"
#include "inc.h"
#include "mbox.h"
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);
# include <gdk/gdkx.h>
#endif
-#include "sylpheed.h"
+#include "claws.h"
#include "main.h"
#include "mainwindow.h"
#include "folderview.h"
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) \
{ \
}
#endif /* HAVE_STARTUP_NOTIFICATION */
-void sylpheed_gtk_idle(void)
+void claws_gtk_idle(void)
{
while(gtk_events_pending()) {
gtk_main_iteration();
gint num_folder_class = 0;
START_TIMING("startup");
- if (!sylpheed_init(&argc, &argv)) {
+ if (!claws_init(&argc, &argv)) {
return 0;
}
exit(1);
account_read_config_all();
if(!account_get_list())
- exit_sylpheed(mainwin);
+ exit_claws(mainwin);
}
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");
cmd.status_full_folders = NULL;
}
- sylpheed_register_idle_function(sylpheed_gtk_idle);
+ claws_register_idle_function(claws_gtk_idle);
prefs_toolbar_init();
END_TIMING();
gtk_main();
- exit_sylpheed(mainwin);
+ exit_claws(mainwin);
return 0;
}
static gboolean sc_exiting = FALSE;
-static void exit_sylpheed(MainWindow *mainwin)
+static void exit_claws(MainWindow *mainwin)
{
gchar *filename;
gtkaspell_checkers_quit();
#endif
plugin_unload_all("Common");
- sylpheed_done();
+ claws_done();
}
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 {
draft_all_messages();
emergency_exit = TRUE;
- exit_sylpheed(static_mainwindow);
+ exit_claws(static_mainwindow);
exit(0);
return FALSE;
gtk_main_quit();
}
-gboolean sylpheed_is_exiting(void)
+gboolean claws_is_exiting(void)
{
return sc_exiting;
}
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__ */
#include "addr_compl.h"
#include "codeconv.h"
#include "quoted-printable.h"
-#include "sylpheed.h"
+#include "claws.h"
#include <ctype.h>
/*!
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;
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);
# include <locale.h>
#endif
-#include "common/sylpheed.h"
+#include "common/claws.h"
#include "common/version.h"
#include "plugin.h"
#include "common/utils.h"
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;
}
#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"
#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"
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;
}
#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"
#include "version.h"
-#include "sylpheed.h"
+#include "claws.h"
#include "plugin.h"
#include "utils.h"
#include "hooks.h"
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;
}
#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"
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;
}
-EXTRA_DIST = version.rc plugin.def sylpheed.def
+EXTRA_DIST = version.rc plugin.def claws.def
if OS_WIN32
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 =
-Wno-deprecated-declarations
clean-local:
- rm -f libsylpheed.a
+ rm -f libclaws.a
prefs_set_default
prefs_write_open
prefs_write_param
-sylpheed_get_version
+claws_get_version
privacy_set_error
privacy_get_error
#endif
#include "version.h"
-#include "common/sylpheed.h"
+#include "common/claws.h"
#include "mainwindow.h"
#include "mimeview.h"
#include "textview.h"
#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;
}
-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
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 =
-Wno-deprecated-declarations
clean-local:
- rm -f libsylpheed.a
+ rm -f libclaws.a
procmime_mimeinfo_parent
procmime_scan_file
procmime_write_mimeinfo
-sylpheed_get_version
+claws_get_version
privacy_set_error
privacy_get_error
privacy_reset_error
#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;
}
-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
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 =
-Wno-deprecated-declarations
clean-local:
- rm -f libsylpheed.a
+ rm -f libclaws.a
procmime_mimeinfo_parent
procmime_scan_file
procmime_write_mimeinfo
-sylpheed_get_version
+claws_get_version
privacy_set_error
privacy_get_error
#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;
}
# include <locale.h>
#endif
-#include "common/sylpheed.h"
+#include "common/claws.h"
#include "common/version.h"
#include "plugin.h"
#include "common/utils.h"
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;
}
#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"
#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"
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) /
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;
}
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);
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)
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;" */
}
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) {
projects / claws.git / commitdiff