diff options
-rw-r--r-- | ChangeLog | 18 | ||||
-rw-r--r-- | ChangeLog.ja | 19 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | libsylph/Makefile.am | 25 | ||||
-rw-r--r-- | libsylph/base64.c (renamed from src/base64.c) | 0 | ||||
-rw-r--r-- | libsylph/base64.h (renamed from src/base64.h) | 0 | ||||
-rw-r--r-- | libsylph/codeconv.c (renamed from src/codeconv.c) | 4 | ||||
-rw-r--r-- | libsylph/codeconv.h (renamed from src/codeconv.h) | 0 | ||||
-rw-r--r-- | libsylph/defs.h | 122 | ||||
-rw-r--r-- | libsylph/prefs.c (renamed from src/prefs.c) | 0 | ||||
-rw-r--r-- | libsylph/prefs.h (renamed from src/prefs.h) | 0 | ||||
-rw-r--r-- | libsylph/quoted-printable.c (renamed from src/quoted-printable.c) | 0 | ||||
-rw-r--r-- | libsylph/quoted-printable.h (renamed from src/quoted-printable.h) | 0 | ||||
-rw-r--r-- | libsylph/session.c (renamed from src/session.c) | 0 | ||||
-rw-r--r-- | libsylph/session.h (renamed from src/session.h) | 0 | ||||
-rw-r--r-- | libsylph/socket.c (renamed from src/socket.c) | 0 | ||||
-rw-r--r-- | libsylph/socket.h (renamed from src/socket.h) | 0 | ||||
-rw-r--r-- | libsylph/ssl.c (renamed from src/ssl.c) | 0 | ||||
-rw-r--r-- | libsylph/ssl.h (renamed from src/ssl.h) | 0 | ||||
-rw-r--r-- | libsylph/stringtable.c (renamed from src/stringtable.c) | 0 | ||||
-rw-r--r-- | libsylph/stringtable.h (renamed from src/stringtable.h) | 0 | ||||
-rw-r--r-- | libsylph/unmime.c (renamed from src/unmime.c) | 0 | ||||
-rw-r--r-- | libsylph/unmime.h (renamed from src/unmime.h) | 0 | ||||
-rw-r--r-- | libsylph/utils.c (renamed from src/utils.c) | 0 | ||||
-rw-r--r-- | libsylph/utils.h (renamed from src/utils.h) | 0 | ||||
-rw-r--r-- | libsylph/uuencode.c (renamed from src/uuencode.c) | 0 | ||||
-rw-r--r-- | libsylph/uuencode.h (renamed from src/uuencode.h) | 0 | ||||
-rw-r--r-- | libsylph/xml.c (renamed from src/xml.c) | 1 | ||||
-rw-r--r-- | libsylph/xml.h (renamed from src/xml.h) | 0 | ||||
-rw-r--r-- | src/Makefile.am | 18 |
31 files changed, 193 insertions, 19 deletions
@@ -1,3 +1,21 @@ +2005-08-31 + + * libsylph/Makefile.am + libsylph/base64.[ch] + libsylph/codeconv.[ch] + libsylph/defs.h + libsylph/prefs.[ch] + libsylph/quoted-printable.[ch] + libsylph/session.[ch] + libsylph/socket.[ch] + libsylph/ssl.[ch] + libsylph/stringtable.[ch] + libsylph/unmime.[ch] + libsylph/utils.[ch] + libsylph/uuencode.[ch] + libsylph/xml.[ch]: made some core modules library (libsylph). + * src/Makefile.am: modified so that it uses libsylph.la. + 2005-08-30 * src/prefs.[ch] diff --git a/ChangeLog.ja b/ChangeLog.ja index 01659a92..552108ab 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,22 @@ +2005-08-31 + + * libsylph/Makefile.am + libsylph/base64.[ch] + libsylph/codeconv.[ch] + libsylph/defs.h + libsylph/prefs.[ch] + libsylph/quoted-printable.[ch] + libsylph/session.[ch] + libsylph/socket.[ch] + libsylph/ssl.[ch] + libsylph/stringtable.[ch] + libsylph/unmime.[ch] + libsylph/utils.[ch] + libsylph/uuencode.[ch] + libsylph/xml.[ch]: いくつかのコアモジュールをライブラリ化した + (libsylph)。 + * src/Makefile.am: libsylph.la を使うように修正。 + 2005-08-30 * src/prefs.[ch] diff --git a/Makefile.am b/Makefile.am index 880e6d73..55f65ca3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = ac po src manual faq +SUBDIRS = ac libsylph src po manual faq EXTRA_DIST = config.rpath \ ChangeLog.ja \ diff --git a/configure.in b/configure.in index 77a12372..bcdccae9 100644 --- a/configure.in +++ b/configure.in @@ -342,10 +342,11 @@ AC_OUTPUT([ Makefile sylpheed.spec ac/Makefile -po/Makefile.in +libsylph/Makefile src/version.h src/Makefile src/icons/Makefile +po/Makefile.in faq/Makefile faq/de/Makefile faq/en/Makefile diff --git a/libsylph/Makefile.am b/libsylph/Makefile.am new file mode 100644 index 00000000..bb2eec32 --- /dev/null +++ b/libsylph/Makefile.am @@ -0,0 +1,25 @@ + +AM_CPPFLAGS = -DG_LOG_DOMAIN=\"LibSylph\" + +INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir) + +#lib_LTLIBRARIES = libsylph.la +noinst_LTLIBRARIES = libsylph.la + +libsylph_la_SOURCES = \ + defs.h \ + base64.c base64.h \ + codeconv.c codeconv.h \ + prefs.c prefs.h \ + quoted-printable.c quoted-printable.h \ + session.c session.h \ + socket.c socket.h \ + ssl.c ssl.h \ + stringtable.c stringtable.h \ + unmime.c unmime.h \ + utils.c utils.h \ + uuencode.c uuencode.h \ + xml.c xml.h + +libsylph_la_LDFLAGS = +libsylph_la_LIBADD = $(GLIB_LIBS) diff --git a/src/base64.c b/libsylph/base64.c index 484cd286..484cd286 100644 --- a/src/base64.c +++ b/libsylph/base64.c diff --git a/src/base64.h b/libsylph/base64.h index 4aa55758..4aa55758 100644 --- a/src/base64.h +++ b/libsylph/base64.h diff --git a/src/codeconv.c b/libsylph/codeconv.c index 4eb68b78..c88b588c 100644 --- a/src/codeconv.c +++ b/libsylph/codeconv.c @@ -41,7 +41,6 @@ #include "base64.h" #include "quoted-printable.h" #include "utils.h" -#include "prefs_common.h" typedef enum { @@ -308,7 +307,8 @@ static gchar *conv_euctojis(const gchar *inbuf, gint *error) } } else if (iseuchwkana1(*in)) { if (iseuchwkana2(*(in + 1))) { - if (prefs_common.allow_jisx0201_kana) { + //if (prefs_common.allow_jisx0201_kana) { + if (0) { HW_IN(); in++; *out++ = *in++ & 0x7f; diff --git a/src/codeconv.h b/libsylph/codeconv.h index 833b1402..833b1402 100644 --- a/src/codeconv.h +++ b/libsylph/codeconv.h diff --git a/libsylph/defs.h b/libsylph/defs.h new file mode 100644 index 00000000..9683c28d --- /dev/null +++ b/libsylph/defs.h @@ -0,0 +1,122 @@ +/* + * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __DEFS_H__ +#define __DEFS_H__ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <glibconfig.h> + +#ifdef G_OS_WIN32 +# include <glib/gwin32.h> +#endif + +#if HAVE_PATHS_H +# include <paths.h> +#endif + +#if HAVE_SYS_PARAM_H +# include <sys/param.h> +#endif + +#define INBOX_DIR "inbox" +#define OUTBOX_DIR "sent" +#define QUEUE_DIR "queue" +#define DRAFT_DIR "draft" +#define TRASH_DIR "trash" +#ifdef G_OS_WIN32 +# define RC_DIR "Sylpheed" +#else +# define RC_DIR ".sylpheed-2.0" +#endif +#define OLD_RC_DIR ".sylpheed" +#define NEWS_CACHE_DIR "newscache" +#define IMAP_CACHE_DIR "imapcache" +#define MIME_TMP_DIR "mimetmp" +#define COMMON_RC "sylpheedrc" +#define ACCOUNT_RC "accountrc" +#define FILTER_RC "filterrc" +#define FILTER_LIST "filter.xml" +#define FILTER_HEADER_RC "filterheaderrc" +#define CUSTOM_HEADER_RC "customheaderrc" +#define DISPLAY_HEADER_RC "dispheaderrc" +#define MENU_RC "menurc" +#define ACTIONS_RC "actionsrc" +#define COMMAND_HISTORY "command_history" +#define TEMPLATE_DIR "templates" +#define TMP_DIR "tmp" +#define UIDL_DIR "uidl" +#define NEWSGROUP_LIST ".newsgroup_list" +#define ADDRESS_BOOK "addressbook.xml" +#define MANUAL_HTML_INDEX "sylpheed.html" +#define FAQ_HTML_INDEX "sylpheed-faq.html" +#define HOMEPAGE_URI "http://sylpheed.good-day.net/" +#define FOLDER_LIST "folderlist.xml" +#define CACHE_FILE ".sylpheed_cache" +#define MARK_FILE ".sylpheed_mark" +#define CACHE_VERSION 0x21 +#define MARK_VERSION 2 + +#ifdef G_OS_WIN32 +# define DEFAULT_SIGNATURE "signature.txt" +#else +# define DEFAULT_SIGNATURE ".signature" +#endif +#define DEFAULT_INC_PATH "/usr/bin/mh/inc" +#define DEFAULT_INC_PROGRAM "inc" +/* #define DEFAULT_INC_PATH "/usr/bin/imget" */ +/* #define DEFAULT_INC_PROGRAM "imget" */ +#define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t -i" +#define DEFAULT_BROWSER_CMD "mozilla-firefox -remote 'openURL(%s,new-window)'" + +#ifdef _PATH_MAILDIR +# define DEFAULT_SPOOL_PATH _PATH_MAILDIR +#else +# define DEFAULT_SPOOL_PATH "/var/spool/mail" +#endif + +#define BUFFSIZE 8192 + +#ifndef MAXPATHLEN +# define MAXPATHLEN 4095 +#endif + +#define DEFAULT_HEIGHT 460 +#define DEFAULT_FOLDERVIEW_WIDTH 179 +#define DEFAULT_MAINVIEW_WIDTH 600 +#define DEFAULT_SUMMARY_HEIGHT 140 +#define DEFAULT_HEADERVIEW_HEIGHT 40 +#define DEFAULT_COMPOSE_HEIGHT 560 +#define BORDER_WIDTH 2 +#define CTREE_INDENT 18 +#define FOLDER_SPACING 4 +#define MAX_ENTRY_LENGTH 8191 +#define COLOR_DIM 35000 +#define UI_REFRESH_INTERVAL 50000 /* usec */ +#define FOLDER_UPDATE_INTERVAL 1500 /* msec */ +#define PROGRESS_UPDATE_INTERVAL 200 /* msec */ +#define SESSION_TIMEOUT_INTERVAL 60 /* sec */ +#define MAX_HISTORY_SIZE 16 + +#define DEFAULT_MESSAGE_FONT "Monospace 12" + +#endif /* __DEFS_H__ */ diff --git a/src/prefs.c b/libsylph/prefs.c index 4579df4f..4579df4f 100644 --- a/src/prefs.c +++ b/libsylph/prefs.c diff --git a/src/prefs.h b/libsylph/prefs.h index f062d1eb..f062d1eb 100644 --- a/src/prefs.h +++ b/libsylph/prefs.h diff --git a/src/quoted-printable.c b/libsylph/quoted-printable.c index cea0b704..cea0b704 100644 --- a/src/quoted-printable.c +++ b/libsylph/quoted-printable.c diff --git a/src/quoted-printable.h b/libsylph/quoted-printable.h index e5abf4f7..e5abf4f7 100644 --- a/src/quoted-printable.h +++ b/libsylph/quoted-printable.h diff --git a/src/session.c b/libsylph/session.c index 6e7fa4e9..6e7fa4e9 100644 --- a/src/session.c +++ b/libsylph/session.c diff --git a/src/session.h b/libsylph/session.h index 9ed0eaf4..9ed0eaf4 100644 --- a/src/session.h +++ b/libsylph/session.h diff --git a/src/socket.c b/libsylph/socket.c index 17063ab1..17063ab1 100644 --- a/src/socket.c +++ b/libsylph/socket.c diff --git a/src/socket.h b/libsylph/socket.h index 5721a304..5721a304 100644 --- a/src/socket.h +++ b/libsylph/socket.h diff --git a/src/ssl.c b/libsylph/ssl.c index b57c60a9..b57c60a9 100644 --- a/src/ssl.c +++ b/libsylph/ssl.c diff --git a/src/ssl.h b/libsylph/ssl.h index 6c13ddac..6c13ddac 100644 --- a/src/ssl.h +++ b/libsylph/ssl.h diff --git a/src/stringtable.c b/libsylph/stringtable.c index da5e0ea4..da5e0ea4 100644 --- a/src/stringtable.c +++ b/libsylph/stringtable.c diff --git a/src/stringtable.h b/libsylph/stringtable.h index 337ef2c7..337ef2c7 100644 --- a/src/stringtable.h +++ b/libsylph/stringtable.h diff --git a/src/unmime.c b/libsylph/unmime.c index 23d787a3..23d787a3 100644 --- a/src/unmime.c +++ b/libsylph/unmime.c diff --git a/src/unmime.h b/libsylph/unmime.h index be9f390e..be9f390e 100644 --- a/src/unmime.h +++ b/libsylph/unmime.h diff --git a/src/utils.c b/libsylph/utils.c index dc72b814..dc72b814 100644 --- a/src/utils.c +++ b/libsylph/utils.c diff --git a/src/utils.h b/libsylph/utils.h index fbda26a3..fbda26a3 100644 --- a/src/utils.h +++ b/libsylph/utils.h diff --git a/src/uuencode.c b/libsylph/uuencode.c index e0b2e79a..e0b2e79a 100644 --- a/src/uuencode.c +++ b/libsylph/uuencode.c diff --git a/src/uuencode.h b/libsylph/uuencode.h index 3658ebc6..3658ebc6 100644 --- a/src/uuencode.h +++ b/libsylph/uuencode.h diff --git a/src/xml.c b/libsylph/xml.c index e9c4adf8..62a04829 100644 --- a/src/xml.c +++ b/libsylph/xml.c @@ -23,7 +23,6 @@ #include <ctype.h> #include "xml.h" -#include "main.h" #include "utils.h" #include "codeconv.h" diff --git a/src/xml.h b/libsylph/xml.h index b41449a4..b41449a4 100644 --- a/src/xml.h +++ b/libsylph/xml.h diff --git a/src/Makefile.am b/src/Makefile.am index 5da41db1..b81e23cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,6 @@ sylpheed_SOURCES = \ gtkshruler.c gtkshruler.h \ menu.c menu.h \ stock_pixmap.c stock_pixmap.h \ - prefs.c prefs.h \ prefs_ui.c prefs_ui.h \ prefs_common.c prefs_common.h \ prefs_filter.c prefs_filter.h \ @@ -76,17 +75,8 @@ sylpheed_SOURCES = \ grouplistdialog.c grouplistdialog.h \ about.c about.h \ setup.c setup.h \ - utils.c utils.h \ gtkutils.c gtkutils.h \ - codeconv.c codeconv.h \ - unmime.c unmime.h \ - base64.c base64.h \ - quoted-printable.c quoted-printable.h \ - uuencode.c uuencode.h \ md5.c md5.h \ - socket.c socket.h \ - ssl.c ssl.h \ - session.c session.h \ smtp.c smtp.h \ pop.c pop.h \ mh.c mh.h \ @@ -99,7 +89,6 @@ sylpheed_SOURCES = \ nntp.c nntp.h \ news.c news.h \ imap.c imap.h \ - xml.c xml.h \ html.c html.h \ procmime.c procmime.h \ rfc2015.c rfc2015.h \ @@ -108,7 +97,6 @@ sylpheed_SOURCES = \ sigstatus.c sigstatus.h \ simple-gettext.c \ manual.c manual.h \ - stringtable.c stringtable.h \ eggtrayicon.c eggtrayicon.h \ trayicon.c trayicon.h \ quote_fmt_lex.l quote_fmt_lex.h \ @@ -132,14 +120,16 @@ INCLUDES = \ $(GTK_CFLAGS) \ $(GDK_PIXBUF_CFLAGS) \ $(GPGME_CFLAGS) \ - -I$(includedir) + -I$(includedir) \ + -I$(top_srcdir)/libsylph sylpheed_LDADD = \ $(INTLLIBS) \ $(GTK_LIBS) \ $(GPGME_LIBS) \ $(LDAP_LIBS) \ - $(LIBICONV) + $(LIBICONV) \ + ../libsylph/libsylph.la AM_CPPFLAGS = \ -DLOCALEDIR=\""$(localedir)"\" \ |