2008-05-18 [colin] 3.4.0cvs50
authorColin Leroy <colin@colino.net>
Sun, 18 May 2008 10:24:33 +0000 (10:24 +0000)
committerColin Leroy <colin@colino.net>
Sun, 18 May 2008 10:24:33 +0000 (10:24 +0000)
* src/mimeview.c
* src/privacy.h
* src/toolbar.c
* src/toolbar.h
* src/plugins/pgpcore/sgpgme.c
Fix more parts of bug 1609:
- Make use of specific Expired privacy icon
- Use CLOSE instead of NOTICE_ERROR for cancel
  receiving
- Allow a Preferences button in the main toolbar

ChangeLog
PATCHSETS
configure.ac
src/mimeview.c
src/plugins/pgpcore/sgpgme.c
src/privacy.h
src/toolbar.c
src/toolbar.h

index 489fde0..474a997 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-05-18 [colin]     3.4.0cvs50
+
+       * src/mimeview.c
+       * src/privacy.h
+       * src/toolbar.c
+       * src/toolbar.h
+       * src/plugins/pgpcore/sgpgme.c
+               Fix more parts of bug 1609:
+               - Make use of specific Expired privacy icon
+               - Use CLOSE instead of NOTICE_ERROR for cancel
+                 receiving
+               - Allow a Preferences button in the main toolbar
+
 2008-05-18 [colin]     3.4.0cvs49
 
        * src/stock_pixmap.c
index 38effc3..e526b91 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.179.2.219 -r 1.179.2.220 src/imap.c;  ) > 3.4.0cvs47.patchset
 ( cvs diff -u -r 1.1.2.52 -r 1.1.2.53 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.367 -r 1.395.2.368 src/summaryview.c;  ) > 3.4.0cvs48.patchset
 ( cvs diff -u -r 1.25.2.54 -r 1.25.2.55 src/stock_pixmap.c;  ) > 3.4.0cvs49.patchset
+( cvs diff -u -r 1.83.2.130 -r 1.83.2.131 src/mimeview.c;  cvs diff -u -r 1.10.2.15 -r 1.10.2.16 src/privacy.h;  cvs diff -u -r 1.43.2.98 -r 1.43.2.99 src/toolbar.c;  cvs diff -u -r 1.19.2.26 -r 1.19.2.27 src/toolbar.h;  cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/plugins/pgpcore/sgpgme.c;  ) > 3.4.0cvs50.patchset
index 80cb9b0..03398c3 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index f3129b8..a197106 100644 (file)
@@ -832,6 +832,11 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo,
                func = display_full_info_cb;
                icon = STOCK_PIXMAP_PRIVACY_WARN;
                break;
+       case SIGNATURE_KEY_EXPIRED:
+               button_text = _("View full information");
+               func = display_full_info_cb;
+               icon = STOCK_PIXMAP_PRIVACY_EXPIRED;
+               break;
        case SIGNATURE_INVALID:
                button_text = _("View full information");
                func = display_full_info_cb;
@@ -2209,6 +2214,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                            STOCK_PIXMAP_PRIVACY_EMBLEM_PASSED, OVERLAY_BOTTOM_RIGHT, 6, 3);
                        break;
                case SIGNATURE_WARN:
+               case SIGNATURE_KEY_EXPIRED:
                        pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
                            STOCK_PIXMAP_PRIVACY_EMBLEM_WARN, OVERLAY_BOTTOM_RIGHT, 6, 3);
                        break;
index 0fcce59..6e55ac6 100644 (file)
@@ -121,8 +121,10 @@ SignatureStatus sgpgme_sigstat_gpgme_to_privacy(gpgme_ctx_t ctx, gpgme_verify_re
                        return SIGNATURE_CHECK_FAILED;
                }
        case GPG_ERR_SIG_EXPIRED:
-       case GPG_ERR_KEY_EXPIRED:
+       case GPG_ERR_CERT_REVOKED:
                return SIGNATURE_WARN;
+       case GPG_ERR_KEY_EXPIRED:
+               return SIGNATURE_KEY_EXPIRED;
        case GPG_ERR_BAD_SIGNATURE:
                return SIGNATURE_INVALID;
        case GPG_ERR_NO_PUBKEY:
index 5b5a93c..4848f32 100644 (file)
@@ -27,6 +27,7 @@ typedef enum {
        SIGNATURE_UNCHECKED,
        SIGNATURE_OK,
        SIGNATURE_WARN,
+       SIGNATURE_KEY_EXPIRED,
        SIGNATURE_INVALID,
        SIGNATURE_CHECK_FAILED,
        SIGNATURE_CHECK_TIMEOUT
index 24d5466..2251d8a 100644 (file)
@@ -146,6 +146,8 @@ static void toolbar_draft_cb                        (GtkWidget      *widget,
                                                 gpointer        data);
 static void toolbar_close_cb                   (GtkWidget      *widget,
                                                 gpointer        data);
+static void toolbar_preferences_cb             (GtkWidget      *widget,
+                                                gpointer        data);
 static void toolbar_open_mail_cb               (GtkWidget      *widget,
                                                 gpointer        data);
 static void toolbar_insert_cb                  (GtkWidget      *widget,
@@ -194,6 +196,7 @@ struct {
        { "A_PRINT",            N_("Print")                                },
        { "A_LEARN_SPAM",       N_("Learn Spam or Ham")                    },
        { "A_GO_FOLDERS",       N_("Open folder/Go to folder list")        },
+       { "A_PREFERENCES",      N_("Preferences")                          },
 
        { "A_SEND",             N_("Send Message")                         },
        { "A_SENDL",            N_("Put into queue folder and send later") },
@@ -332,7 +335,7 @@ GList *toolbar_get_action_items(ToolbarType source)
                                        A_TRASH , A_DELETE_REAL,       A_EXECUTE,       A_GOTO_PREV, 
                                        A_GOTO_NEXT,    A_IGNORE_THREAD,  A_WATCH_THREAD,       A_PRINT,
                                        A_ADDRBOOK,     A_LEARN_SPAM, A_GO_FOLDERS, 
-                                       A_CANCEL_INC };
+                                       A_CANCEL_INC,   A_PREFERENCES };
 
                for (i = 0; i < sizeof main_items / sizeof main_items[0]; i++)  {
                        items = g_list_append(items, gettext(toolbar_text[main_items[i]].descr));
@@ -433,6 +436,7 @@ const gchar *toolbar_get_short_text(int action) {
        case A_WATCH_THREAD:    return _("Watch thread");
        case A_PRINT:           return _("Print");
        case A_CLOSE:           return _("Close");
+       case A_PREFERENCES:     return _("Preferences");
        case A_SEND:            return _("Send");
        case A_SENDL:           return _("Send later");
        case A_DRAFT:           return _("Draft");
@@ -475,6 +479,7 @@ gint toolbar_get_icon(int action) {
        case A_WATCH_THREAD:    return STOCK_PIXMAP_WATCHTHREAD;
        case A_PRINT:           return STOCK_PIXMAP_PRINTER;
        case A_CLOSE:           return STOCK_PIXMAP_CLOSE;
+       case A_PREFERENCES:     return STOCK_PIXMAP_PREFERENCES;
        case A_SEND:            return STOCK_PIXMAP_MAIL_SEND;
        case A_SENDL:           return STOCK_PIXMAP_MAIL_SEND_QUEUE;
        case A_DRAFT:           return STOCK_PIXMAP_MAIL;
@@ -485,7 +490,7 @@ gint toolbar_get_icon(int action) {
        case A_LINEWRAP_CURRENT:return STOCK_PIXMAP_LINEWRAP_CURRENT;
        case A_LINEWRAP_ALL:    return STOCK_PIXMAP_LINEWRAP_ALL;
        case A_ADDRBOOK:        return STOCK_PIXMAP_ADDRESS_BOOK;
-       case A_CANCEL_INC:      return STOCK_PIXMAP_NOTICE_ERROR;
+       case A_CANCEL_INC:      return STOCK_PIXMAP_CLOSE;
        case A_EXECUTE:         return STOCK_PIXMAP_EXEC;
        #ifdef USE_ASPELL
        case A_CHECK_SPELLING:  return STOCK_PIXMAP_CHECK_SPELLING;
@@ -1524,6 +1529,11 @@ static void toolbar_close_cb(GtkWidget *widget, gpointer data)
        }
 }
 
+static void toolbar_preferences_cb(GtkWidget *widget, gpointer data)
+{
+       prefs_gtk_open();
+}
+
 static void toolbar_open_mail_cb(GtkWidget *widget, gpointer data)
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
@@ -1697,6 +1707,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
                { A_DRAFT,              toolbar_draft_cb                },
                { A_OPEN_MAIL,          toolbar_open_mail_cb            },
                { A_CLOSE,              toolbar_close_cb                },
+               { A_PREFERENCES,        toolbar_preferences_cb          },
                { A_INSERT,             toolbar_insert_cb               },
                { A_ATTACH,             toolbar_attach_cb               },
                { A_SIG,                toolbar_sig_cb                  },
@@ -1872,6 +1883,10 @@ Toolbar *toolbar_create(ToolbarType       type,
                        TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Close window"));
                        toolbar_data->close_window_btn = item; 
                        break;
+               case A_PREFERENCES:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Open preferences"));
+                       toolbar_data->preferences_btn = item; 
+                       break;
                case A_OPEN_MAIL:
                        TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Open email"));
                        toolbar_data->open_mail_btn = item; 
index 3c7b640..1fa452c 100644 (file)
@@ -98,6 +98,8 @@ struct _Toolbar {
        GtkWidget *open_mail_btn;
        GtkWidget *close_window_btn;
 
+       GtkWidget *preferences_btn;
+
        GSList    *action_list;
        GSList    *item_list;
 
@@ -170,6 +172,7 @@ enum {
        A_PRINT,
        A_LEARN_SPAM,
        A_GO_FOLDERS,
+       A_PREFERENCES,
 
        /* compose toolbar */
        A_SEND,