sync with 0.8.5cvs24

diff --git a/ChangeLog b/ChangeLog
index e5df2e4bd81e204866a9e281dfaea79bfe78ffe7..12528055c8af54a61b4d5d9341e28daa2b2c638c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-13
+
+       * src/textview.c: textview_add_part(): indicate signature status
+         using different colors.
+

 2002-11-12
 
        * src/folder.c: folder_write_list_recursive(): escape
 2002-11-12
 
        * src/folder.c: folder_write_list_recursive(): escape

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7730af8f7ad8fe9c06506d649a262f3ed3979a8b..2c4868eb4755463163c14d4ba8660c0e57292597 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-11-13 [paul]      0.8.5claws138
+
+       * sync with 0.8.5cvs24
+               see ChangeLog 2002-11-13
+               
+       * po/pt_BR.po
+               updated by Fabio Jr. Beneditto
+

 2002-11-13 [colin]     0.8.5claws137
        
        * src/msgcache.c
 2002-11-13 [colin]     0.8.5claws137
        
        * src/msgcache.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 879e32f39891eae538cbc9fb48dc410ef47cd9ad..cadb3dc095d757d965090c49f0e30a4755dc2791 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,7 @@
+2002-11-13
+
+       * src/textview.c: textview_add_part(): ½ð̾¤Î¾õÂÖ¤ò°Û¤Ê¤ë¿§¤Çɽ¼¨¡£
+

 2002-11-12
 
        * src/folder.c: folder_write_list_recursive(): To/Cc/Bcc/Reply-To
 2002-11-12
 
        * src/folder.c: folder_write_list_recursive(): To/Cc/Bcc/Reply-To

diff --git a/configure.in b/configure.in
index 257e9049ffc5a6731d7ba2b2f487db14631ac97a..933ce4732b26df6fed1ce2b858385c946c2c1f35 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws137
+EXTRA_VERSION=claws138

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/textview.c b/src/textview.c
index 309633efaaa0da283f991907a8ba565a2bb5666a..1a16f09c9c567069966b7e770dfb658c77fab928 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -98,6 +98,29 @@ static GdkColor error_color = {
 };
 #endif
 
 };
 #endif
 

+#if USE_GPGME
+static GdkColor good_sig_color = {
+       (gulong)0,
+       (gushort)0,
+       (gushort)0xbfff,
+       (gushort)0
+};
+
+static GdkColor nocheck_sig_color = {
+       (gulong)0,
+       (gushort)0,
+       (gushort)0,
+       (gushort)0xcfff
+};
+
+static GdkColor bad_sig_color = {
+       (gulong)0,
+       (gushort)0xefff,
+       (gushort)0,
+       (gushort)0
+};
+#endif
+

 static GdkFont *text_sb_font;
 static GdkFont *text_mb_font;
 static gint text_sb_font_orig_ascent;
 static GdkFont *text_sb_font;
 static GdkFont *text_mb_font;
 static gint text_sb_font_orig_ascent;


@@ -506,6 +529,15 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                textview->msgfont = (GdkFont *)oldfont;
                oldfont = NULL;
                g_free(tmp);
                textview->msgfont = (GdkFont *)oldfont;
                oldfont = NULL;
                g_free(tmp);

+       } else if (mimeinfo->sigstatus) {
+               GdkColor *color;
+               if (!strcmp(mimeinfo->sigstatus, _("Good signature")))
+                       color = &good_sig_color;
+               else if (!strcmp(mimeinfo->sigstatus, _("BAD signature")))
+                       color = &bad_sig_color;
+               else
+                       color = &nocheck_sig_color; 
+               gtk_stext_insert(text, NULL, color, NULL, buf, -1);

        } else
 #endif
        if (mimeinfo->mime_type != MIME_TEXT &&
        } else
 #endif
        if (mimeinfo->mime_type != MIME_TEXT &&