2005-10-16 [colin] 1.9.15cvs50

[claws.git] / src / mimeview.c

diff --git a/src/mimeview.c b/src/mimeview.c
index 6dc050e917f3708e38040ce3e89b9802c3d11d03..c188e0d20593743ce4ec392bd2f2d99304020245 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -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;
        }