From: Colin Leroy <colin@colino.net>
Date: Thu, 26 Apr 2007 19:24:15 +0000 (+0000)
Subject: 2007-04-26 [colin]	2.9.1cvs28
X-Git-Tag: rel_2_10_0~101
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4107efb0c5e7c779629272a20c41d28dd3ee54ec;hp=cba47d31ad7d629fec774c606c742c1a1bf0460f

2007-04-26 [colin]	2.9.1cvs28

	* src/imap.c
	* src/imap.h
		Fix uselessly exported function
	* src/textview.c
		Consider "- -- \n" as signature separator
		(that's what signature separators look like
		 in PGP/Inline signed mails)
---

diff --git a/ChangeLog b/ChangeLog
index de3fcfd3f..cfe17a01b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-26 [colin]	2.9.1cvs28
+
+	* src/imap.c
+	* src/imap.h
+		Fix uselessly exported function
+	* src/textview.c
+		Consider "- -- \n" as signature separator
+		(that's what signature separators look like
+		 in PGP/Inline signed mails)
+
 2007-04-26 [colin]	2.9.1cvs27
 
 	* configure.ac
diff --git a/PATCHSETS b/PATCHSETS
index e8cfd3d48..e3a197691 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2555,3 +2555,4 @@
 ( cvs diff -u -r 1.213.2.141 -r 1.213.2.142 src/folder.c;  ) > 2.9.1cvs25.patchset
 ( cvs diff -u -r 1.179.2.166 -r 1.179.2.167 src/imap.c;  cvs diff -u -r 1.34.2.14 -r 1.34.2.15 src/imap.h;  cvs diff -u -r 1.274.2.185 -r 1.274.2.186 src/mainwindow.c;  cvs diff -u -r 1.43.2.65 -r 1.43.2.66 src/toolbar.c;  cvs diff -u -r 1.1.4.77 -r 1.1.4.78 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/etpan/imap-thread.h;  ) > 2.9.1cvs26.patchset
 ( cvs diff -u -r 1.654.2.2610 -r 1.654.2.2611 configure.ac;  cvs diff -u -r 1.49.2.91 -r 1.49.2.92 src/procmime.c;  cvs diff -u -r 1.179.2.167 -r 1.179.2.168 src/imap.c;  ) > 2.9.1cvs27.patchset
+( cvs diff -u -r 1.179.2.168 -r 1.179.2.169 src/imap.c;  cvs diff -u -r 1.34.2.15 -r 1.34.2.16 src/imap.h;  cvs diff -u -r 1.96.2.170 -r 1.96.2.171 src/textview.c;  ) > 2.9.1cvs28.patchset
diff --git a/configure.ac b/configure.ac
index 1ec5c7119..1a0d9b1f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap.c b/src/imap.c
index 543a5037c..43656a1ad 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -304,6 +304,7 @@ static gchar *imap_get_real_path		(IMAPSession	*session,
 						 IMAPFolder	*folder,
 						 const gchar	*path);
 static void imap_synchronise		(FolderItem	*item);
+static gboolean imap_is_busy		(Folder *folder);
 
 static void imap_free_capabilities	(IMAPSession 	*session);
 
@@ -4656,7 +4657,7 @@ gboolean imap_cancel_all_enabled(void)
 	return FALSE;
 }
 
-gboolean imap_is_busy(Folder *folder)
+static gboolean imap_is_busy(Folder *folder)
 {
 	IMAPSession *imap_session;
 	RemoteFolder *rfolder;
@@ -4770,11 +4771,6 @@ gboolean imap_cancel_all_enabled(void)
 	return FALSE;
 }
 
-gboolean imap_is_busy(Folder *folder)
-{
-	return FALSE;
-}
-
 #endif
 
 void imap_synchronise(FolderItem *item) 
diff --git a/src/imap.h b/src/imap.h
index cb2998e21..f9800c193 100644
--- a/src/imap.h
+++ b/src/imap.h
@@ -43,5 +43,4 @@ void imap_cache_msg(FolderItem *item, gint msgnum);
 
 void imap_cancel_all(void);
 gboolean imap_cancel_all_enabled(void);
-gboolean imap_is_busy(Folder *folder);
 #endif /* __IMAP_H__ */
diff --git a/src/textview.c b/src/textview.c
index 79772e265..a49e4d4a7 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1392,7 +1392,8 @@ static void textview_write_line(TextView *textview, const gchar *str,
 		fg_color = quote_tag_str;
 	}
 
-	if (prefs_common.enable_color && (strcmp(buf,"-- \n") == 0 || textview->is_in_signature)) {
+	if (prefs_common.enable_color && 
+	    (strcmp(buf,"-- \n") == 0 || strcmp(buf, "- -- \n") == 0 || textview->is_in_signature)) {
 		fg_color = "signature";
 		textview->is_in_signature = TRUE;
 	}