+2003-10-17 [christoph] 0.9.6claws33
+
+ * src/mimeview.c
+ * src/noticeview.[ch]
+ change noticeview icon to indicate signature status
+
2003-10-17 [christoph] 0.9.6claws32
* src/Makefile.am
MICRO_VERSION=6
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
else
if (privacy_mimeinfo_is_signed(mimeinfo)) {
gchar *text = NULL, *button_text = NULL;
GtkSignalFunc func = NULL;
-
+ StockPixmap icon;
+
switch (privacy_mimeinfo_get_sig_status(mimeinfo)) {
case SIGNATURE_UNCHECKED:
text = _("This part of the message has been signed");
button_text = _("Check");
func = check_signature_cb;
+ icon = STOCK_PIXMAP_MIME_GPG_SIGNED;
break;
case SIGNATURE_OK:
+ text = _("Signature is ok");
+ icon = STOCK_PIXMAP_MIME_GPG_PASSED;
+ break;
case SIGNATURE_WARN:
text = _("Signature is ok");
+ icon = STOCK_PIXMAP_NOTICE_WARN;
break;
case SIGNATURE_INVALID:
text = _("The signature of this part is invalid");
+ icon = STOCK_PIXMAP_MIME_GPG_FAILED;
break;
case SIGNATURE_CHECK_FAILED:
text = _("Checking the signature failed");
button_text = _("Check again");
func = check_signature_cb;
+ icon = STOCK_PIXMAP_MIME_GPG_UNKNOWN;
default:
break;
}
mimeview->siginfoview,
func,
(gpointer) mimeview);
+ noticeview_set_icon(mimeview->siginfoview, icon);
noticeview_show(mimeview->siginfoview);
} else {
noticeview_hide(mimeview->siginfoview);
debug_print("Creating notice view...\n");
noticeview = g_new0(NoticeView, 1);
+ noticeview->window = mainwin->window;
+
vbox = gtk_vbox_new(FALSE, 4);
gtk_widget_show(vbox);
hsep = gtk_hseparator_new();
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
- icon = stock_pixmap_widget(mainwin->window, STOCK_PIXMAP_NOTICE_WARN);
+ icon = stock_pixmap_widget(noticeview->window, STOCK_PIXMAP_NOTICE_WARN);
#if 0
/* also possible... */
icon = gtk_pixmap_new(NULL, NULL);
noticeview->press(noticeview, noticeview->user_data);
}
}
+
+void noticeview_set_icon(NoticeView *noticeview, StockPixmap icon)
+{
+ GdkPixmap *pixmap;
+ GdkBitmap *bitmap;
+
+ if (stock_pixmap_gdk(noticeview->window, icon, &pixmap, &bitmap) < 0)
+ return;
+
+ gtk_pixmap_set(noticeview->icon, pixmap, bitmap);
+}
typedef struct _NoticeView NoticeView;
+#include "stock_pixmap.h"
+
struct _NoticeView
{
GtkWidget *vbox;
GtkWidget *icon;
GtkWidget *text;
GtkWidget *button;
+ GtkWidget *window;
gboolean visible;
gpointer user_data;
void (*press) (NoticeView *, gpointer user_data);
void noticeview_destroy (NoticeView *noticeview);
void noticeview_init (NoticeView *noticeview);
void noticeview_set_icon (NoticeView *noticeview,
- GtkWidget *icon);
+ StockPixmap icon);
void noticeview_set_text (NoticeView *noticeview,
const gchar *text);
void noticeview_set_button_text
gpointer *user_data);
#endif /* NOTICEVIEW_H__ */
-