2007-02-17 [colin] 2.7.2cvs48

	* src/messageview.c
		Reset icon to warning in the noticeview

diff --git a/ChangeLog b/ChangeLog
index 4f3e1d6a9dfb5a51d063b8c44653efbb74da979d..1f6e0236dcfd0c5e39368d13318fa2fd6be26750 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-17 [colin]     2.7.2cvs48
+
+       * src/messageview.c
+               Reset icon to warning in the noticeview
+
 2007-02-15 [colin]     2.7.2cvs47
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 984a7c0aae791eb46cb448a056e672c69ece1e6c..c1c0480980c3fea4f69048e5b55f9e8d255aa76a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2365,3 +2365,4 @@
 ( cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/prefs_gpg.h;  cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/plugins/pgpmime/pgpmime.c;  ) > 2.7.2cvs45.patchset
 ( cvs diff -u -r 1.60.2.80 -r 1.60.2.81 src/addressbook.c;  ) > 2.7.2cvs46.patchset
 ( cvs diff -u -r 1.207.2.147 -r 1.207.2.148 src/folderview.c;  ) > 2.7.2cvs47.patchset
+( cvs diff -u -r 1.94.2.123 -r 1.94.2.124 src/messageview.c;  ) > 2.7.2cvs48.patchset

diff --git a/configure.ac b/configure.ac
index c5fd9eea4ae541700af136d0725c5b63f92409ef..9866a48db1dc02e46177e624d2a8c1cb34528fce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=48
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/messageview.c b/src/messageview.c
index e4cb7edfc494805ba7c09560a07ff5c98764d718..9afc96a59eb1f874c241df727958ae9bf7654190 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1215,10 +1215,12 @@ static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
        }
 
        if (from_me) {
+               noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
                noticeview_set_text(noticeview, _("You asked for a return receipt in this message."));
                noticeview_set_button_text(noticeview, NULL);
                noticeview_set_button_press_callback(noticeview, NULL, NULL);
        } else {
+               noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
                noticeview_set_text(noticeview, _("This message asks for a return receipt."));
                noticeview_set_button_text(noticeview, _("Send receipt"));
                noticeview_set_button_press_callback(noticeview,
@@ -1305,6 +1307,7 @@ static void partial_recv_show(NoticeView *noticeview, MsgInfo *msginfo)
                }
        }
        
+       noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
        noticeview_set_text(noticeview, text);
        g_free(text);
        noticeview_set_button_text(noticeview, button1);