23 files changed, 53 insertions, 378 deletions

diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 00000000..9dd7fdec
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,12 @@
+/.deps
+/.libs
+/Makefile
+/Makefile.in
+/quote_fmt_lex.c
+/quote_fmt_parse.c
+/quote_fmt_parse.h
+/sylpheed-marshal.c
+/sylpheed-marshal.h
+/sylpheed
+/sylpheed.rc
+/version.h
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index c247f1c6..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,191 +0,0 @@
-SUBDIRS = icons
-
-bin_PROGRAMS = sylpheed
-
-sylpheed_SOURCES = \
-	version.h \
-	main.c main.h \
-	mainwindow.c mainwindow.h \
-	folderview.c folderview.h \
-	summaryview.c summaryview.h \
-	messageview.c messageview.h \
-	headerview.c headerview.h \
-	textview.c textview.h \
-	imageview.c imageview.h \
-	mimeview.c mimeview.h \
-	quick_search.c quick_search.h \
-	query_search.c query_search.h \
-	message_search.c message_search.h \
-	colorlabel.c colorlabel.h \
-	action.c action.h \
-	compose.c compose.h \
-	gtkshruler.c gtkshruler.h \
-	menu.c menu.h \
-	stock_pixmap.c stock_pixmap.h \
-	prefs_ui.c prefs_ui.h \
-	prefs_common_dialog.c prefs_common_dialog.h \
-	prefs_filter.c prefs_filter.h \
-	prefs_filter_edit.c prefs_filter_edit.h \
-	prefs_account_dialog.c prefs_account_dialog.h \
-	prefs_folder_item.c prefs_folder_item.h \
-	prefs_display_items.c prefs_display_items.h \
-	prefs_display_header.c prefs_display_header.h \
-	prefs_customheader.c prefs_customheader.h \
-	prefs_summary_column.c prefs_summary_column.h \
-	prefs_template.c prefs_template.h \
-	prefs_actions.c prefs_actions.h \
-	prefs_search_folder.c prefs_search_folder.h \
-	prefs_toolbar.c prefs_toolbar.h \
-	account_dialog.c account_dialog.h \
-	template.c template.h \
-	addressbook.c addressbook.h \
-	addr_compl.c addr_compl.h \
-	addressitem.h \
-	addritem.c addritem.h \
-	addrcache.c addrcache.h \
-	addrbook.c addrbook.h \
-	addrindex.c addrindex.h \
-	mgutils.c mgutils.h \
-	vcard.c vcard.h \
-	ldif.c ldif.h \
-	importldif.c importldif.h \
-	importcsv.c importcsv.h \
-	exportcsv.c exportcsv.h \
-	jpilot.c jpilot.h \
-	syldap.c syldap.h \
-	editbook.c editbook.h \
-	editgroup.c editgroup.h \
-	editaddress.c editaddress.h \
-	editvcard.c editvcard.h \
-	editjpilot.c editjpilot.h \
-	editldap.c editldap.h \
-	editldap_basedn.c editldap_basedn.h \
-	addressadd.c addressadd.h \
-	filesel.c filesel.h \
-	foldersel.c foldersel.h \
-	statusbar.c statusbar.h \
-	logwindow.c logwindow.h \
-	sourcewindow.c sourcewindow.h \
-	manage_window.c manage_window.h \
-	undo.c undo.h \
-	alertpanel.c alertpanel.h \
-	inputdialog.c inputdialog.h \
-	progressdialog.c progressdialog.h \
-	subscribedialog.c subscribedialog.h \
-	about.c about.h \
-	setup.c setup.h \
-	gtkutils.c gtkutils.h \
-	send_message.c send_message.h \
-	inc.c inc.h \
-	rpop3.c rpop3.h \
-	import.c import.h \
-	export.c export.h \
-	rfc2015.c rfc2015.h \
-	passphrase.c passphrase.h \
-	select-keys.c select-keys.h \
-	sigstatus.c sigstatus.h \
-	simple-gettext.c \
-	manual.c manual.h \
-	eggtrayicon.c eggtrayicon.h \
-	trayicon.c trayicon.h \
-	printing.c printing.h \
-	sslmanager.c sslmanager.h \
-	plugin_manager.c plugin_manager.h \
-	update_check.c update_check.h \
-	quote_fmt_lex.l quote_fmt_lex.h \
-	quote_fmt_parse.y quote_fmt.h \
-	sylpheed-marshal.c sylpheed-marshal.h \
-	notificationwindow.c notificationwindow.h
-
-BUILT_SOURCES = \
-	quote_fmt_lex.c \
-	quote_fmt_parse.c \
-	quote_fmt_parse.h \
-	sylpheed-marshal.c \
-	sylpheed-marshal.h \
-	plugin-marshal.c \
-	plugin-marshal.h
-
-lib_LTLIBRARIES = libsylpheed-plugin-0.la
-
-libsylpheed_plugin_0_la_SOURCES = \
-	plugin-marshal.c plugin-marshal.h \
-	plugin.c
-
-libsylpheed_plugin_0includedir=$(includedir)/sylpheed
-libsylpheed_plugin_0include_HEADERS = \
-	plugin.h \
-	plugin-types.h
-
-if NATIVE_WIN32
-no_undefined = -no-undefined
-export_symbols = -export-symbols libsylpheed-plugin-0.def
-endif
-
-libsylpheed_plugin_0_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-	-export-dynamic $(no_undefined) $(export_symbols)
-
-libsylpheed_plugin_0_la_LIBADD = \
-	$(GTK_LIBS) \
-	$(GLIB_LIBS) \
-	../libsylph/libsylph-0.la
-
-EXTRA_DIST = \
-	quote_fmt_parse.h \
-	sylpheed-marshal.list \
-	plugin-marshal.list \
-	version.h.in \
-	sylpheed.rc.in \
-	sylpheed.exe.manifest \
-	libsylpheed-plugin-0.def
-
-INCLUDES = \
-	-DG_LOG_DOMAIN=\"Sylpheed\" \
-	-I$(top_srcdir)/libsylph \
-	$(GTK_CFLAGS) \
-	$(GDK_PIXBUF_CFLAGS) \
-	$(GPGME_CFLAGS)
-
-if NATIVE_WIN32
-SYLPHEED_RES = sylpheed.res
-sylpheed.res: sylpheed.rc icons/sylpheed.ico sylpheed.exe.manifest
-	$(WINDRES) $< -O coff -o $@
-else
-SYLPHEED_RES = 
-endif
-
-sylpheed_LDADD = \
-	$(INTLLIBS) \
-	$(GTK_LIBS) \
-	$(GLIB_LIBS) \
-	$(GPGME_LIBS) \
-	$(LDAP_LIBS) \
-	$(LIBICONV) \
-	$(SYLPHEED_LIBS) \
-	libsylpheed-plugin-0.la \
-	../libsylph/libsylph-0.la \
-	$(SYLPHEED_RES)
-
-AM_CPPFLAGS = \
-	-DLOCALEDIR=\""$(localedir)"\" \
-	-DMANUALDIR=\""$(manualdir)"\" \
-	-DFAQDIR=\""$(faqdir)"\" \
-	-DPLUGINDIR=\""$(plugindir)"\" \
-	-DTHEMEDIR=\""$(themedir)"\" \
-	-DTARGET_ALIAS=\""$(target_triplet)"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)"\"
-
-AM_YFLAGS = -d
-
-sylpheed-marshal.h: sylpheed-marshal.list
-	$(GLIB_GENMARSHAL) $< --header --prefix=sylpheed_marshal > $@
-
-sylpheed-marshal.c: sylpheed-marshal.list
-	$(GLIB_GENMARSHAL) $< --body --prefix=sylpheed_marshal > $@
-
-plugin-marshal.h: plugin-marshal.list
-	$(GLIB_GENMARSHAL) $< --header --prefix=syl_plugin_marshal > $@
-
-plugin-marshal.c: plugin-marshal.list
-	$(GLIB_GENMARSHAL) $< --body --prefix=syl_plugin_marshal > $@
diff --git a/src/icons/.gitignore b/src/icons/.gitignore
new file mode 100644
index 00000000..a6caeca2
--- /dev/null
+++ b/src/icons/.gitignore
@@ -0,0 +1,3 @@
+/Makefile
+/Makefile.in
+/*.h
diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
deleted file mode 100644
index 2c7cd17f..00000000
--- a/src/icons/Makefile.am
+++ /dev/null
@@ -1,99 +0,0 @@
-BUILT_SOURCES = \
-	stock_addressbook.h \
-	stock_attach.h \
-	stock_delete.h \
-	stock_delete_16.h \
-	stock_hand-signed.h \
-	stock_inbox.h \
-	stock_insert-file.h \
-	stock_mail-compose.h \
-	stock_mail-compose_16.h \
-	stock_mail-forward.h \
-	stock_mail-receive.h \
-	stock_mail-reply-to-all.h \
-	stock_mail-reply.h \
-	stock_mail-send.h \
-	stock_mail.h \
-	stock_mail_receive_all.h \
-	stock_mail_send_queue.h \
-	stock_outbox.h \
-	stock_person.h \
-	stock_book.h \
-	stock_spam.h \
-	stock_spam_16.h \
-	stock_notspam.h \
-	stock_sylpheed.h \
-	stock_sylpheed_16.h \
-	stock_sylpheed_32.h \
-	stock_sylpheed_newmail.h \
-	stock_sylpheed_newmail_16.h \
-	sylpheed-logo.h \
-	folder-close.h \
-	folder-open.h \
-	folder-noselect.h \
-	folder-search.h \
-	group.h \
-	html.h
-
-EXTRA_DIST = \
-	stock_addressbook.png \
-	stock_attach.png \
-	stock_delete.png \
-	stock_delete_16.png \
-	stock_hand-signed.png \
-	stock_inbox.png \
-	stock_insert-file.png \
-	stock_mail-compose.png \
-	stock_mail-compose_16.png \
-	stock_mail-forward.png \
-	stock_mail-receive.png \
-	stock_mail-reply-to-all.png \
-	stock_mail-reply.png \
-	stock_mail-send.png \
-	stock_mail.png \
-	stock_mail_receive_all.png \
-	stock_mail_send_queue.png \
-	stock_outbox.png \
-	stock_person.png \
-	stock_book.png \
-	stock_spam.png \
-	stock_spam_16.png \
-	stock_notspam.png \
-	stock_sylpheed.png \
-	stock_sylpheed_16.png \
-	stock_sylpheed_32.png \
-	stock_sylpheed_newmail.png \
-	stock_sylpheed_newmail_16.png \
-	sylpheed-logo.png \
-	folder-close.png \
-	folder-open.png \
-	folder-noselect.png \
-	folder-search.png \
-	group.png \
-	html.png \
-	clip.xpm \
-	deleted.xpm \
-	forwarded.xpm \
-	mark.xpm \
-	new.xpm \
-	offline.xpm \
-	online.xpm \
-	replied.xpm \
-	unread.xpm \
-	linewrap.xpm \
-	continue.xpm \
-	complete.xpm \
-	error.xpm \
-	address.xpm \
-	book.xpm \
-	category.xpm \
-	interface.xpm \
-	jpilot.xpm \
-	ldap.xpm \
-	vcard.xpm \
-	mail.xpm \
-	sylpheed.ico \
-	$(BUILT_SOURCES)
-
-%.h: %.png
-	gdk-pixbuf-csource --name=`echo $(*F)|sed s/-/_/g` $< > $@
diff --git a/src/icons/folder-close.png b/src/icons/folder_close.png
index f764bdbd..f764bdbd 100644
--- a/src/icons/folder-close.png
+++ b/src/icons/folder_close.png
diff --git a/src/icons/folder-noselect.png b/src/icons/folder_noselect.png
index f5f3175b..f5f3175b 100644
--- a/src/icons/folder-noselect.png
+++ b/src/icons/folder_noselect.png
diff --git a/src/icons/folder-open.png b/src/icons/folder_open.png
index 809ecaca..809ecaca 100644
--- a/src/icons/folder-open.png
+++ b/src/icons/folder_open.png
diff --git a/src/icons/folder-search.png b/src/icons/folder_search.png
index e5d5abcf..e5d5abcf 100644
--- a/src/icons/folder-search.png
+++ b/src/icons/folder_search.png
diff --git a/src/icons/stock_hand-signed.png b/src/icons/stock_hand_signed.png
index 02774f24..02774f24 100644
--- a/src/icons/stock_hand-signed.png
+++ b/src/icons/stock_hand_signed.png
diff --git a/src/icons/stock_insert-file.png b/src/icons/stock_insert_file.png
index 34aed99d..34aed99d 100644
--- a/src/icons/stock_insert-file.png
+++ b/src/icons/stock_insert_file.png
diff --git a/src/icons/stock_mail-compose.png b/src/icons/stock_mail_compose.png
index b0d4e136..b0d4e136 100644
--- a/src/icons/stock_mail-compose.png
+++ b/src/icons/stock_mail_compose.png
diff --git a/src/icons/stock_mail-compose_16.png b/src/icons/stock_mail_compose_16.png
index 7c7d597d..7c7d597d 100644
--- a/src/icons/stock_mail-compose_16.png
+++ b/src/icons/stock_mail_compose_16.png
diff --git a/src/icons/stock_mail-forward.png b/src/icons/stock_mail_forward.png
index f848a60f..f848a60f 100644
--- a/src/icons/stock_mail-forward.png
+++ b/src/icons/stock_mail_forward.png
diff --git a/src/icons/stock_mail-receive.png b/src/icons/stock_mail_receive.png
index 20580e03..20580e03 100644
--- a/src/icons/stock_mail-receive.png
+++ b/src/icons/stock_mail_receive.png
diff --git a/src/icons/stock_mail-reply.png b/src/icons/stock_mail_reply.png
index 47eecc61..47eecc61 100644
--- a/src/icons/stock_mail-reply.png
+++ b/src/icons/stock_mail_reply.png
diff --git a/src/icons/stock_mail-reply-to-all.png b/src/icons/stock_mail_reply_to_all.png
index e2685771..e2685771 100644
--- a/src/icons/stock_mail-reply-to-all.png
+++ b/src/icons/stock_mail_reply_to_all.png
diff --git a/src/icons/stock_mail-send.png b/src/icons/stock_mail_send.png
index e1fa1519..e1fa1519 100644
--- a/src/icons/stock_mail-send.png
+++ b/src/icons/stock_mail_send.png
diff --git a/src/icons/sylpheed-logo.png b/src/icons/sylpheed_logo.png
index 1423da50..1423da50 100644
--- a/src/icons/sylpheed-logo.png
+++ b/src/icons/sylpheed_logo.png
diff --git a/src/quote_fmt_lex.h b/src/quote_fmt_lex.h
deleted file mode 100644
index 585751a1..00000000
--- a/src/quote_fmt_lex.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* The following defines shamelessly stolen from GDB sources... */
-
-/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
-   as well as gratuitiously global symbol names, so we can have multiple
-   yacc generated parsers in gdb.  Note that these are only the variables
-   produced by yacc.  If other parser generators (bison, byacc, etc) produce
-   additional global names that conflict at link time, then those parser
-   generators need to be fixed instead of adding those names to this list. */
-
-#define	yymaxdepth quote_fmtmaxdepth
-#define	yyparse	quote_fmtparse
-#define	yylex	quote_fmtlex
-#define	yyerror	quote_fmterror
-#define	yylval	quote_fmtlval
-#define	yychar	quote_fmtchar
-#define	yydebug	quote_fmtdebug
-#define	yypact	quote_fmtpact	
-#define	yyr1	quote_fmtr1			
-#define	yyr2	quote_fmtr2			
-#define	yydef	quote_fmtdef		
-#define	yychk	quote_fmtchk		
-#define	yypgo	quote_fmtpgo		
-#define	yyact	quote_fmtact		
-#define	yyexca	quote_fmtexca
-#define yyerrflag quote_fmterrflag
-#define yynerrs	quote_fmtnerrs
-#define	yyps	quote_fmtps
-#define	yypv	quote_fmtpv
-#define	yys	quote_fmts
-#define	yy_yys	quote_fmtyys
-#define	yystate	quote_fmtstate
-#define	yytmp	quote_fmttmp
-#define	yyv	quote_fmtv
-#define	yy_yyv	quote_fmtyyv
-#define	yyval	quote_fmtval
-#define	yylloc	quote_fmtlloc
-#define yyreds	quote_fmtreds		/* With YYDEBUG defined */
-#define yytoks	quote_fmttoks		/* With YYDEBUG defined */
-#define yylhs	quote_fmtyylhs
-#define yylen	quote_fmtyylen
-#define yydefred quote_fmtyydefred
-#define yydgoto	quote_fmtyydgoto
-#define yysindex quote_fmtyysindex
-#define yyrindex quote_fmtyyrindex
-#define yygindex quote_fmtyygindex
-#define yytable	 quote_fmtyytable
-#define yycheck	 quote_fmtyycheck
diff --git a/src/quote_fmt_lex.l b/src/quote_fmt_lex.l
index 7f904c17..c330345e 100644
--- a/src/quote_fmt_lex.l
+++ b/src/quote_fmt_lex.l
@@ -1,10 +1,8 @@
 %{
-#include "quote_fmt_lex.h"
-#include "quote_fmt_parse.h"
+#include "quote_fmt_parse.tab.h"
 %}
 
 %option prefix="quote_fmt"
-%option outfile="lex.yy.c"
 
 %%
 
@@ -41,6 +39,6 @@
 "?r" /* query references */ return QUERY_REFERENCES;
 "{" return OPARENT;
 "}" return CPARENT;
-. { yylval.chr = yytext[0]; return CHARACTER; }
+. { quote_fmtlval.chr = yytext[0]; return CHARACTER; }
 
 %%
diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 336b481a..98337179 100644
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -10,7 +10,6 @@
 #include "utils.h"
 
 #include "quote_fmt.h"
-#include "quote_fmt_lex.h"
 
 /* decl */
 /*
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 5cb8c5e2..62493be3 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -47,41 +47,41 @@
 #include "icons/online.xpm"
 #include "icons/offline.xpm"
 #include "icons/mail.xpm"
-#include "icons/stock_inbox.h"
-#include "icons/stock_outbox.h"
-#include "icons/stock_mail.h"
-#include "icons/stock_attach.h"
-#include "icons/stock_mail-compose.h"
-#include "icons/stock_mail-compose_16.h"
-#include "icons/stock_mail-forward.h"
-#include "icons/stock_mail-receive.h"
-#include "icons/stock_mail_receive_all.h"
-#include "icons/stock_mail-reply.h"
-#include "icons/stock_mail-reply-to-all.h"
-#include "icons/stock_mail-send.h"
-#include "icons/stock_mail_send_queue.h"
-#include "icons/stock_insert-file.h"
-#include "icons/stock_addressbook.h"
-#include "icons/stock_delete.h"
-#include "icons/stock_delete_16.h"
-#include "icons/stock_spam.h"
-#include "icons/stock_spam_16.h"
-#include "icons/stock_notspam.h"
-#include "icons/stock_hand-signed.h"
-#include "icons/stock_sylpheed.h"
-#include "icons/stock_sylpheed_16.h"
-#include "icons/stock_sylpheed_32.h"
-#include "icons/stock_sylpheed_newmail.h"
-#include "icons/stock_sylpheed_newmail_16.h"
-#include "icons/sylpheed-logo.h"
-#include "icons/stock_person.h"
-#include "icons/stock_book.h"
-#include "icons/folder-close.h"
-#include "icons/folder-open.h"
-#include "icons/folder-noselect.h"
-#include "icons/folder-search.h"
-#include "icons/group.h"
-#include "icons/html.h"
+#include "icon_stock_inbox.h"
+#include "icon_stock_outbox.h"
+#include "icon_stock_mail.h"
+#include "icon_stock_attach.h"
+#include "icon_stock_mail_compose.h"
+#include "icon_stock_mail_compose_16.h"
+#include "icon_stock_mail_forward.h"
+#include "icon_stock_mail_receive.h"
+#include "icon_stock_mail_receive_all.h"
+#include "icon_stock_mail_reply.h"
+#include "icon_stock_mail_reply_to_all.h"
+#include "icon_stock_mail_send.h"
+#include "icon_stock_mail_send_queue.h"
+#include "icon_stock_insert_file.h"
+#include "icon_stock_addressbook.h"
+#include "icon_stock_delete.h"
+#include "icon_stock_delete_16.h"
+#include "icon_stock_spam.h"
+#include "icon_stock_spam_16.h"
+#include "icon_stock_notspam.h"
+#include "icon_stock_hand_signed.h"
+#include "icon_stock_sylpheed.h"
+#include "icon_stock_sylpheed_16.h"
+#include "icon_stock_sylpheed_32.h"
+#include "icon_stock_sylpheed_newmail.h"
+#include "icon_stock_sylpheed_newmail_16.h"
+#include "icon_sylpheed_logo.h"
+#include "icon_stock_person.h"
+#include "icon_stock_book.h"
+#include "icon_folder_close.h"
+#include "icon_folder_open.h"
+#include "icon_folder_noselect.h"
+#include "icon_folder_search.h"
+#include "icon_group.h"
+#include "icon_html.h"
 
 typedef struct _StockPixmapData	StockPixmapData;
 
diff --git a/src/version.h.in b/src/version.h.in
index 05ee734b..a3941904 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -28,6 +28,6 @@
 #define EXTRA_VERSION		"@EXTRA_VERSION@"
 #define PROG_VERSION		"Sylpheed " VERSION
 
-#define BUILD_REVISION		@BUILD_REVISION@
+#define BUILD_REVISION		VCS_TAG
 
 #endif /* __VERSION_H__ */