2007-02-20 [colin] 2.7.2cvs58
authorColin Leroy <colin@colino.net>
Tue, 20 Feb 2007 18:45:33 +0000 (18:45 +0000)
committerColin Leroy <colin@colino.net>
Tue, 20 Feb 2007 18:45:33 +0000 (18:45 +0000)
* src/Makefile.am
* src/mimeview.c
* src/stock_pixmap.c
* src/stock_pixmap.h
* src/pixmaps/mime_pgpsig.xpm
Add icon for application/pgp-signature

ChangeLog
PATCHSETS
configure.ac
src/Makefile.am
src/mimeview.c
src/pixmaps/mime_pgpsig.xpm [new file with mode: 0644]
src/stock_pixmap.c
src/stock_pixmap.h

index 9a51a41..da720fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-20 [colin]     2.7.2cvs58
+
+       * src/Makefile.am
+       * src/mimeview.c
+       * src/stock_pixmap.c
+       * src/stock_pixmap.h
+       * src/pixmaps/mime_pgpsig.xpm
+               Add icon for application/pgp-signature
+
 2007-02-20 [colin]     2.7.2cvs57
 
        * src/Makefile.am
 2007-02-20 [colin]     2.7.2cvs57
 
        * src/Makefile.am
index 8ff6c06..8d81d1b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.25.2.22 -r 1.25.2.23 src/matcher_parser_parse.y;  ) > 2.7.2cvs55.patchset
 ( cvs diff -u -r 1.4.2.7 -r 1.4.2.8 autogen.sh;  cvs diff -u -r 1.25.2.23 -r 1.25.2.24 src/matcher_parser_parse.y;  cvs diff -u -r 1.16.2.11 -r 1.16.2.12 src/matcher_parser_lex.l;  ) > 2.7.2cvs56.patchset
 ( cvs diff -u -r 1.155.2.51 -r 1.155.2.52 src/Makefile.am;  cvs diff -u -r 1.115.2.136 -r 1.115.2.137 src/main.c;  cvs diff -u -r 1.83.2.101 -r 1.83.2.102 src/mimeview.c;  cvs diff -u -r 1.25.2.31 -r 1.25.2.32 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.22 -r 1.18.2.23 src/stock_pixmap.h;  diff -u /dev/null src/pixmaps/mime_calendar.xpm;  diff -u /dev/null src/pixmaps/mime_pdf.xpm;  diff -u /dev/null src/pixmaps/mime_ps.xpm;  ) > 2.7.2cvs57.patchset
 ( cvs diff -u -r 1.25.2.22 -r 1.25.2.23 src/matcher_parser_parse.y;  ) > 2.7.2cvs55.patchset
 ( cvs diff -u -r 1.4.2.7 -r 1.4.2.8 autogen.sh;  cvs diff -u -r 1.25.2.23 -r 1.25.2.24 src/matcher_parser_parse.y;  cvs diff -u -r 1.16.2.11 -r 1.16.2.12 src/matcher_parser_lex.l;  ) > 2.7.2cvs56.patchset
 ( cvs diff -u -r 1.155.2.51 -r 1.155.2.52 src/Makefile.am;  cvs diff -u -r 1.115.2.136 -r 1.115.2.137 src/main.c;  cvs diff -u -r 1.83.2.101 -r 1.83.2.102 src/mimeview.c;  cvs diff -u -r 1.25.2.31 -r 1.25.2.32 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.22 -r 1.18.2.23 src/stock_pixmap.h;  diff -u /dev/null src/pixmaps/mime_calendar.xpm;  diff -u /dev/null src/pixmaps/mime_pdf.xpm;  diff -u /dev/null src/pixmaps/mime_ps.xpm;  ) > 2.7.2cvs57.patchset
+( cvs diff -u -r 1.155.2.52 -r 1.155.2.53 src/Makefile.am;  cvs diff -u -r 1.83.2.102 -r 1.83.2.103 src/mimeview.c;  cvs diff -u -r 1.25.2.32 -r 1.25.2.33 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.23 -r 1.18.2.24 src/stock_pixmap.h;  diff -u /dev/null src/pixmaps/mime_pgpsig.xpm;  ) > 2.7.2cvs58.patchset
index 976b8e7..bfaf842 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=57
+EXTRA_VERSION=58
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index faef2f2..c3e85f5 100644 (file)
@@ -356,6 +356,7 @@ EXTRA_DIST = \
        pixmaps/mime_pdf.xpm \
        pixmaps/mime_ps.xpm \
        pixmaps/mime_calendar.xpm \
        pixmaps/mime_pdf.xpm \
        pixmaps/mime_ps.xpm \
        pixmaps/mime_calendar.xpm \
+       pixmaps/mime_pgpsig.xpm \
        pixmaps/mime_text_enriched.xpm \
        pixmaps/mime_text_html.xpm \
        pixmaps/mime_text_plain.xpm \
        pixmaps/mime_text_enriched.xpm \
        pixmaps/mime_text_html.xpm \
        pixmaps/mime_text_plain.xpm \
index cbb9870..8b2df7b 100644 (file)
@@ -2010,7 +2010,9 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:
                stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:
-               if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pdf"))
+               if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature"))
+                       stockp = STOCK_PIXMAP_MIME_PGP_SIG;
+               else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pdf"))
                        stockp = STOCK_PIXMAP_MIME_PDF;
                else if  (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "postscript"))
                        stockp = STOCK_PIXMAP_MIME_PS;
                        stockp = STOCK_PIXMAP_MIME_PDF;
                else if  (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "postscript"))
                        stockp = STOCK_PIXMAP_MIME_PS;
diff --git a/src/pixmaps/mime_pgpsig.xpm b/src/pixmaps/mime_pgpsig.xpm
new file mode 100644 (file)
index 0000000..8d250c2
--- /dev/null
@@ -0,0 +1,60 @@
+/* XPM */
+static char * mime_pgpsig_xpm[] = {
+"16 16 41 1",
+"      c None",
+".     c #000000",
+"+     c #FEFEFE",
+"@     c #FDFDFD",
+"#     c #E0E0E0",
+"$     c #C1C1C1",
+"%     c #F1F1F1",
+"&     c #C3C3C3",
+"*     c #FBFBFB",
+"=     c #A8A8A8",
+"-     c #ADADAD",
+";     c #767676",
+">     c #5D5D5D",
+",     c #404040",
+"'     c #F0F0F0",
+")     c #E2E2E2",
+"!     c #858585",
+"~     c #4B4B49",
+"{     c #161616",
+"]     c #EFEFEF",
+"^     c #040204",
+"/     c #EEEEEE",
+"(     c #C5C5C5",
+"_     c #FCFE04",
+":     c #C4C4C4",
+"<     c #C0C0C0",
+"[     c #EAEAEA",
+"}     c #E9E9E9",
+"|     c #E8E8E8",
+"1     c #BFBFBF",
+"2     c #E6E6E6",
+"3     c #E5E5E5",
+"4     c #BEBEBE",
+"5     c #E7E7E7",
+"6     c #E4E4E4",
+"7     c #BDBDBD",
+"8     c #E3E3E3",
+"9     c #BBBBBB",
+"0     c #C2C2C2",
+"a     c #BCBCBC",
+"b     c #A0A0A0",
+"   .........    ",
+"  .++++++@#$.   ",
+"  .+%%%%%%&*=.  ",
+"  .+%%%%%%-;>,. ",
+"  .+%%%%%')!~{. ",
+"  .+%]]]]]^^/(. ",
+"  .+]]]//^__^:. ",
+"  .@^^^^^___^&. ",
+"  .%^_____^_^$. ",
+"  .@^_^_^___^<. ",
+"  .@[^}^|^__^1. ",
+"  .@|22222^^34. ",
+"  .@5522233667. ",
+"  .@2333668889. ",
+"  .0777aa9999b. ",
+"   ...........  "};
index 6a2b4c2..5d3a0e5 100644 (file)
@@ -98,6 +98,7 @@
 #include "pixmaps/mime_pdf.xpm"
 #include "pixmaps/mime_ps.xpm"
 #include "pixmaps/mime_calendar.xpm"
 #include "pixmaps/mime_pdf.xpm"
 #include "pixmaps/mime_ps.xpm"
 #include "pixmaps/mime_calendar.xpm"
+#include "pixmaps/mime_pgpsig.xpm"
 #include "pixmaps/privacy_signed.xpm"
 #include "pixmaps/privacy_passed.xpm"
 #include "pixmaps/privacy_failed.xpm"
 #include "pixmaps/privacy_signed.xpm"
 #include "pixmaps/privacy_passed.xpm"
 #include "pixmaps/privacy_failed.xpm"
@@ -294,6 +295,7 @@ static StockPixmapData pixmaps[] =
        {mime_pdf_xpm                           , NULL, NULL, "mime_pdf", NULL},        
        {mime_ps_xpm                            , NULL, NULL, "mime_ps", NULL}, 
        {mime_calendar_xpm                      , NULL, NULL, "mime_calendar", NULL},   
        {mime_pdf_xpm                           , NULL, NULL, "mime_pdf", NULL},        
        {mime_ps_xpm                            , NULL, NULL, "mime_ps", NULL}, 
        {mime_calendar_xpm                      , NULL, NULL, "mime_calendar", NULL},   
+       {mime_pgpsig_xpm                        , NULL, NULL, "mime_pgpsig", NULL},     
        {privacy_signed_xpm                     , NULL, NULL, "privacy_signed", NULL},
        {privacy_passed_xpm                     , NULL, NULL, "privacy_passed", NULL},
        {privacy_failed_xpm                     , NULL, NULL, "privacy_failed", NULL},  
        {privacy_signed_xpm                     , NULL, NULL, "privacy_signed", NULL},
        {privacy_passed_xpm                     , NULL, NULL, "privacy_passed", NULL},
        {privacy_failed_xpm                     , NULL, NULL, "privacy_failed", NULL},  
index 801fd23..b87986e 100644 (file)
@@ -140,6 +140,7 @@ typedef enum
        STOCK_PIXMAP_MIME_PDF,
        STOCK_PIXMAP_MIME_PS,
        STOCK_PIXMAP_MIME_TEXT_CALENDAR,
        STOCK_PIXMAP_MIME_PDF,
        STOCK_PIXMAP_MIME_PS,
        STOCK_PIXMAP_MIME_TEXT_CALENDAR,
+       STOCK_PIXMAP_MIME_PGP_SIG,
        STOCK_PIXMAP_PRIVACY_SIGNED,
        STOCK_PIXMAP_PRIVACY_PASSED,
        STOCK_PIXMAP_PRIVACY_FAILED,
        STOCK_PIXMAP_PRIVACY_SIGNED,
        STOCK_PIXMAP_PRIVACY_PASSED,
        STOCK_PIXMAP_PRIVACY_FAILED,