2005-10-16 [colin] 1.9.15cvs50
authorColin Leroy <colin@colino.net>
Sun, 16 Oct 2005 11:08:46 +0000 (11:08 +0000)
committerColin Leroy <colin@colino.net>
Sun, 16 Oct 2005 11:08:46 +0000 (11:08 +0000)
* src/mimeview.c
* src/summaryview.c
* src/textview.c
Make 'c' check signature, and forward
c, l, y, t from summaryview to mimeview

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/mimeview.c
src/summaryview.c
src/textview.c

index 9a4bf94b9bc01dc4951ffb672f27faf0bda594f5..4ef37e0adb1283dd1b9d19f0f604602a089ce0bd 100644 (file)
@@ -1,3 +1,11 @@
+2005-10-16 [colin]     1.9.15cvs50
+
+       * src/mimeview.c
+       * src/summaryview.c
+       * src/textview.c
+               Make 'c' check signature, and forward
+               c, l, y, t from summaryview to mimeview
+
 2005-10-16 [colin]     1.9.15cvs49
 
        * src/addressbook.c
index e87d4b6591ce1864e40754677dd72324f7add01e..61be5353383ee2383f576a106ecb8817afcaf347 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.274.2.73 -r 1.274.2.74 src/mainwindow.c;  cvs diff -u -r 1.59.2.24 -r 1.59.2.25 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.27 -r 1.43.2.28 src/prefs_matcher.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/passphrase.c;  ) > 1.9.15cvs47.patchset
 ( cvs diff -u -r 1.5.12.6 -r 1.5.12.7 src/editjpilot.c;  cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/editldap.c;  cvs diff -u -r 1.5.12.5 -r 1.5.12.6 src/editvcard.c;  cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/expldifdlg.c;  cvs diff -u -r 1.8.2.14 -r 1.8.2.15 src/export.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/import.c;  cvs diff -u -r 1.14.2.6 -r 1.14.2.7 src/importldif.c;  cvs diff -u -r 1.4.12.8 -r 1.4.12.9 src/importmutt.c;  cvs diff -u -r 1.1.14.8 -r 1.1.14.9 src/importpine.c;  cvs diff -u -r 1.105.2.38 -r 1.105.2.39 src/prefs_account.c;  cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/prefs_spelling.c;  cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/gtk/gtkutils.h;  cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/plugins/clamav/clamav_plugin_gtk.c;  cvs diff -u -r 1.23.2.12 -r 1.23.2.13 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 1.9.15cvs48.patchset
 ( cvs diff -u -r 1.60.2.33 -r 1.60.2.34 src/addressbook.c;  cvs diff -u -r 1.274.2.74 -r 1.274.2.75 src/mainwindow.c;  cvs diff -u -r 1.395.2.137 -r 1.395.2.138 src/summaryview.c;  ) > 1.9.15cvs49.patchset
+( cvs diff -u -r 1.83.2.44 -r 1.83.2.45 src/mimeview.c;  cvs diff -u -r 1.395.2.138 -r 1.395.2.139 src/summaryview.c;  cvs diff -u -r 1.96.2.78 -r 1.96.2.79 src/textview.c;  ) > 1.9.15cvs50.patchset
index 236e81ecb8d80f40a9ce0e5716dd31fbbc455997..c10be9ddc719d947fa4cb2a6619bec81953d409a 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 6dc050e917f3708e38040ce3e89b9802c3d11d03..c188e0d20593743ce4ec392bd2f2d99304020245 100644 (file)
@@ -626,6 +626,7 @@ void mimeview_clear(MimeView *mimeview)
 }
 
 static void check_signature_cb(GtkWidget *widget, gpointer user_data);
+void mimeview_check_signature(MimeView *mimeview);
 static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
 
 static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
@@ -665,7 +666,13 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
        default:
                break;
        }
-       text = privacy_mimeinfo_sig_info_short(mimeinfo);
+       if (privacy_mimeinfo_get_sig_status(mimeinfo) == SIGNATURE_UNCHECKED) {
+               gchar *tmp = privacy_mimeinfo_sig_info_short(mimeinfo);
+               text = g_strdup_printf("%s %s",
+                       tmp, _("Click the icon to check it."));
+               g_free(tmp);
+       } else
+               text = privacy_mimeinfo_sig_info_short(mimeinfo);
        noticeview_set_text(mimeview->siginfoview, text);
        g_free(text);
        noticeview_set_button_text(mimeview->siginfoview, NULL);
@@ -682,12 +689,20 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
        MimeView *mimeview = (MimeView *) user_data;
        MimeInfo *mimeinfo = mimeview->siginfo;
        
+       if (mimeinfo == NULL)
+               return;
+
        privacy_mimeinfo_check_signature(mimeinfo);
        update_signature_noticeview(mimeview, mimeview->siginfo);
        icon_list_clear(mimeview);
        icon_list_create(mimeview, mimeview->mimeinfo);
 }
 
+void mimeview_check_signature(MimeView *mimeview)
+{
+       check_signature_cb(NULL, mimeview);     
+}
+
 static void redisplay_email(GtkWidget *widget, gpointer user_data)
 {
        MimeView *mimeview = (MimeView *) user_data;
@@ -957,6 +972,11 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                KEY_PRESS_EVENT_STOP();
                mimeview_open_with(mimeview);
                return TRUE;
+       case GDK_c:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_check_signature(mimeview);
+               return TRUE;
        default:
                break;
        }
@@ -1517,6 +1537,11 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
                KEY_PRESS_EVENT_STOP();
                mimeview_open_with(mimeview);
                return TRUE;
+       case GDK_c:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_check_signature(mimeview);
+               return TRUE;
        default:
                break;
        }
index cb0252bafedb1750eb9e452d67ab898f8589f76d..19512ecd17ab8dc6f843de0231b9f5445588b210 100644 (file)
@@ -4732,6 +4732,15 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                BREAK_ON_MODIFIER_KEY();
                summary_delete_trash(summaryview);
                break;
+       case GDK_y:
+       case GDK_t:
+       case GDK_l:
+       case GDK_c:
+               if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
+                       mimeview_pass_key_press_event(messageview->mimeview,
+                                                     event);
+                       break;
+               }
        default:
                break;
        }
index 0d9c7e9c56caccca3c8d3176a97adca4fc418d9e..5f2d6a7bc5241648b9cb2d556ef5ab1570c4fbe0 100644 (file)
@@ -1590,6 +1590,7 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_y:
        case GDK_t:
        case GDK_l:
+       case GDK_c:
                if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
                        KEY_PRESS_EVENT_STOP();
                        mimeview_pass_key_press_event(messageview->mimeview,