commit aa6b8ec48f363c8af62e90b719ae3539191336c3
parent a54f0cb49ac5ee596cbb19ce30b036bf56757975
Author: Tristan Chabredier <wwp@claws-mail.org>
Date: Tue, 16 Sep 2008 13:22:19 +0000
2008-09-16 [wwp] 3.5.0cvs107
* src/compose.c
Complete 3.5.0cvs106 by removing a function that got
moved to account.[ch].
Diffstat:
4 files changed, 8 insertions(+), 54 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-16 [wwp] 3.5.0cvs107
+
+ * src/compose.c
+ Complete 3.5.0cvs106 by removing a function that got
+ moved to account.[ch].
+
2008-09-16 [wwp] 3.5.0cvs106
* src/account.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3518,3 +3518,4 @@
( cvs diff -u -r 1.65.2.59 -r 1.65.2.60 src/codeconv.c; cvs diff -u -r 1.15.2.20 -r 1.15.2.21 src/codeconv.h; ) > 3.5.0cvs104.patchset
( cvs diff -u -r 1.179.2.227 -r 1.179.2.228 src/imap.c; cvs diff -u -r 1.149.2.94 -r 1.149.2.95 src/inc.c; cvs diff -u -r 1.274.2.271 -r 1.274.2.272 src/mainwindow.c; cvs diff -u -r 1.39.2.50 -r 1.39.2.51 src/mainwindow.h; cvs diff -u -r 1.101.2.53 -r 1.101.2.54 src/news.c; cvs diff -u -r 1.49.2.39 -r 1.49.2.40 src/prefs_account.h; cvs diff -u -r 1.204.2.178 -r 1.204.2.179 src/prefs_common.c; cvs diff -u -r 1.103.2.113 -r 1.103.2.114 src/prefs_common.h; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_other.c; cvs diff -u -r 1.17.2.49 -r 1.17.2.50 src/send_message.c; cvs diff -u -r 1.2.2.32 -r 1.2.2.33 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/inputdialog.h; ) > 3.5.0cvs105.patchset
( cvs diff -u -r 1.61.2.84 -r 1.61.2.85 src/account.c; cvs diff -u -r 1.11.2.11 -r 1.11.2.12 src/account.h; cvs diff -u -r 1.382.2.475 -r 1.382.2.476 src/compose.c; cvs diff -u -r 1.8.2.36 -r 1.8.2.37 src/quote_fmt.c; cvs diff -u -r 1.8.2.17 -r 1.8.2.18 src/quote_fmt_lex.l; cvs diff -u -r 1.22.2.40 -r 1.22.2.41 src/quote_fmt_parse.y; ) > 3.5.0cvs106.patchset
+( cvs diff -u -r 1.382.2.476 -r 1.382.2.477 src/compose.c; ) > 3.5.0cvs107.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=106
+EXTRA_VERSION=107
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/compose.c b/src/compose.c
@@ -238,7 +238,6 @@ static void compose_reedit_set_entry (Compose *compose,
static void compose_insert_sig (Compose *compose,
gboolean replace);
-static gchar *compose_get_signature_str (Compose *compose);
static ComposeInsertResult compose_insert_file (Compose *compose,
const gchar *file);
@@ -3240,58 +3239,6 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
UNBLOCK_WRAP();
}
-static gchar *compose_get_signature_str(Compose *compose)
-{
- gchar *sig_body = NULL;
- gchar *sig_str = NULL;
- gchar *utf8_sig_str = NULL;
-
- g_return_val_if_fail(compose->account != NULL, NULL);
-
- if (!compose->account->sig_path)
- return NULL;
-
- if (compose->account->sig_type == SIG_FILE) {
- if (!is_file_or_fifo_exist(compose->account->sig_path)) {
- g_warning("can't open signature file: %s\n",
- compose->account->sig_path);
- return NULL;
- }
- }
-
- if (compose->account->sig_type == SIG_COMMAND)
- sig_body = get_command_output(compose->account->sig_path);
- else {
- gchar *tmp;
-
- tmp = file_read_to_str(compose->account->sig_path);
- if (!tmp)
- return NULL;
- sig_body = normalize_newlines(tmp);
- g_free(tmp);
- }
-
- if (compose->account->sig_sep) {
- sig_str = g_strconcat("\n", compose->account->sig_sep, "\n", sig_body,
- NULL);
- g_free(sig_body);
- } else
- sig_str = g_strconcat("\n", sig_body, NULL);
-
- if (sig_str) {
- if (g_utf8_validate(sig_str, -1, NULL) == TRUE)
- utf8_sig_str = sig_str;
- else {
- utf8_sig_str = conv_codeset_strdup
- (sig_str, conv_get_locale_charset_str_no_utf8(),
- CS_INTERNAL);
- g_free(sig_str);
- }
- }
-
- return utf8_sig_str;
-}
-
static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *file)
{
GtkTextView *text;
