From abe2df52d008cd7a7ba90020320f5387b2e2d3c5 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Fri, 30 Jul 2010 04:14:01 +0000
Subject: added new account option 'Put signature before quote (not
 recommended)'.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2645 ee746299-78ed-0310-b773-934348b2243d
---
 libsylph/folder.c        | 7 +++++--
 libsylph/prefs_account.c | 4 +++-
 libsylph/prefs_account.h | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'libsylph')

diff --git a/libsylph/folder.c b/libsylph/folder.c
index c6cb8a74..74ab3df7 100644
--- a/libsylph/folder.c
+++ b/libsylph/folder.c
@@ -131,15 +131,18 @@ void folder_destroy(Folder *folder)
 	g_return_if_fail(folder != NULL);
 	g_return_if_fail(folder->klass->destroy != NULL);
 
+	debug_print("folder_destroy: destroying Folder (%p)\n", folder);
+
 	folder->klass->destroy(folder);
 
 	folder_list = g_list_remove(folder_list, folder);
 
+	folder_tree_destroy(folder);
+
 	priv = folder_get_priv(folder);
 	folder_priv_list = g_list_remove(folder_priv_list, priv);
 	g_free(priv);
 
-	folder_tree_destroy(folder);
 	g_free(folder->name);
 	g_free(folder);
 }
@@ -419,7 +422,7 @@ void folder_add(Folder *folder)
 	gint i;
 	FolderPrivData *priv;
 
-	debug_print("Adding folder (%p) to folder list\n", folder);
+	debug_print("Adding Folder (%p) to folder list\n", folder);
 
 	g_return_if_fail(folder != NULL);
 
diff --git a/libsylph/prefs_account.c b/libsylph/prefs_account.c
index c9eee518..6682af7a 100644
--- a/libsylph/prefs_account.c
+++ b/libsylph/prefs_account.c
@@ -1,6 +1,6 @@
 /*
  * LibSylph -- E-Mail client library
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2010 Hiroyuki Yamamoto
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -84,6 +84,8 @@ static PrefParam param[] = {
 	{"signature_path", "~" G_DIR_SEPARATOR_S DEFAULT_SIGNATURE,
 	 &tmp_ac_prefs.sig_path, P_STRING},
 	{"signature_text", NULL, &tmp_ac_prefs.sig_text, P_STRING},
+	{"signature_before_quote", "FALSE", &tmp_ac_prefs.sig_before_quote,
+	 P_BOOL},
 	{"set_autocc", "FALSE", &tmp_ac_prefs.set_autocc, P_BOOL},
 	{"auto_cc", NULL, &tmp_ac_prefs.auto_cc, P_STRING},
 	{"set_autobcc", "FALSE", &tmp_ac_prefs.set_autobcc, P_BOOL},
diff --git a/libsylph/prefs_account.h b/libsylph/prefs_account.h
index 1e9bd4b0..d666fd1b 100644
--- a/libsylph/prefs_account.h
+++ b/libsylph/prefs_account.h
@@ -166,6 +166,9 @@ struct _PrefsAccount
 	gint account_id;
 
 	RemoteFolder *folder;
+
+	/* Compose */
+	gboolean  sig_before_quote;
 };
 
 PrefsAccount *prefs_account_new		(void);
-- 
cgit v1.2.3