commit ec3a012f75675d76362faa5a928cc2833b105800
parent 7fcd5f0c53d1cd3857af24acf2d564894c221e22
Author: Paul Mangan <paul@claws-mail.org>
Date: Sun, 10 Feb 2008 11:54:44 +0000
2008-02-10 [paul] 3.3.0cvs4
* src/Makefile.am
* src/mimeview.c
* src/prefs_toolbar.c
* src/stock_pixmap.c
* src/stock_pixmap.h
* src/pixmaps/mime_text_patch.xpm
add an icon for attached patches
Diffstat:
9 files changed, 150 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-10 [paul] 3.3.0cvs4
+
+ * src/Makefile.am
+ * src/mimeview.c
+ * src/prefs_toolbar.c
+ * src/stock_pixmap.c
+ * src/stock_pixmap.h
+ * src/pixmaps/mime_text_patch.xpm
+ add an icon for attached patches
+
2008-02-09 [paul] 3.3.0cvs3
* src/gtk/about.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3217,3 +3217,4 @@
( cvs diff -u -r 1.36.2.134 -r 1.36.2.135 src/common/utils.c; ) > 3.3.0cvs1.patchset
( cvs diff -u -r 1.115.2.184 -r 1.115.2.185 src/main.c; ) > 3.3.0cvs2.patchset
( cvs diff -u -r 1.4.2.60 -r 1.4.2.61 src/gtk/about.c; ) > 3.3.0cvs3.patchset
+( cvs diff -u -r 1.155.2.83 -r 1.155.2.84 src/Makefile.am; cvs diff -u -r 1.83.2.127 -r 1.83.2.128 src/mimeview.c; cvs diff -u -r 1.30.2.47 -r 1.30.2.48 src/prefs_toolbar.c; cvs diff -u -r 1.25.2.51 -r 1.25.2.52 src/stock_pixmap.c; cvs diff -u -r 1.18.2.33 -r 1.18.2.34 src/stock_pixmap.h; diff -u /dev/null src/pixmaps/mime_text_patch.xpm; ) > 3.3.0cvs4.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -383,6 +383,7 @@ EXTRA_DIST = \
pixmaps/mime_pgpsig.xpm \
pixmaps/mime_text_enriched.xpm \
pixmaps/mime_text_html.xpm \
+ pixmaps/mime_text_patch.xpm \
pixmaps/mime_text_plain.xpm \
pixmaps/mime_unknown.xpm \
pixmaps/news_compose.xpm \
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -2128,6 +2128,9 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
stockp = STOCK_PIXMAP_MIME_TEXT_ENRICHED;
else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "calendar"))
stockp = STOCK_PIXMAP_MIME_TEXT_CALENDAR;
+ else if (mimeinfo->subtype && (!g_ascii_strcasecmp(mimeinfo->subtype, "x-patch")
+ || !g_ascii_strcasecmp(mimeinfo->subtype, "x-diff")))
+ stockp = STOCK_PIXMAP_MIME_TEXT_PATCH;
else
stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
break;
diff --git a/src/pixmaps/mime_text_patch.xpm b/src/pixmaps/mime_text_patch.xpm
@@ -0,0 +1,130 @@
+/* XPM */
+static char * mime_text_patch_xpm[] = {
+"16 16 111 2",
+" c None",
+". c #000000",
+"+ c #959595",
+"@ c #C0C0C0",
+"# c #BFBFBF",
+"$ c #AFAFAF",
+"% c #999999",
+"& c #272727",
+"* c #BCBCBC",
+"= c #FBFBFB",
+"- c #F8F8F8",
+"; c #F9F9F9",
+"> c #DCDCDC",
+", c #F0F0F0",
+"' c #9F9F9F",
+") c #202020",
+"! c #BBBBBB",
+"~ c #5E5858",
+"{ c #A7A4A4",
+"] c #A29E9E",
+"^ c #9E9E9E",
+"/ c #808080",
+"( c #414141",
+"_ c #0C0C0C",
+": c #A8A4A4",
+"< c #CCCDCD",
+"[ c #CAC9C9",
+"} c #A3A0A0",
+"| c #919596",
+"1 c #535453",
+"2 c #272726",
+"3 c #060606",
+"4 c #FB2926",
+"5 c #FB1B17",
+"6 c #FC1412",
+"7 c #FC1917",
+"8 c #F0D8D4",
+"9 c #F64842",
+"0 c #DD5649",
+"a c #C9B1AC",
+"b c #A8AAAB",
+"c c #222222",
+"d c #F7F7F7",
+"e c #F4A8A8",
+"f c #F5A09E",
+"g c #F39694",
+"h c #F39C9B",
+"i c #F4D3D6",
+"j c #F5908F",
+"k c #F4EAEA",
+"l c #DADBDB",
+"m c #2E2E2E",
+"n c #F6F6F6",
+"o c #37C429",
+"p c #92DB8E",
+"q c #91D88A",
+"r c #D7D3D7",
+"s c #2D2D2D",
+"t c #BABABA",
+"u c #92D88A",
+"v c #C1E2BE",
+"w c #C0E1BC",
+"x c #90D78A",
+"y c #BEE2BB",
+"z c #D3D2D3",
+"A c #2C2C2C",
+"B c #F5F5F5",
+"C c #92D68B",
+"D c #90D689",
+"E c #D4D0D4",
+"F c #F4F4F4",
+"G c #90D789",
+"H c #90D183",
+"I c #BCD9B2",
+"J c #90D688",
+"K c #8FD688",
+"L c #BCDFB8",
+"M c #D1CFD0",
+"N c #F92826",
+"O c #F28A8B",
+"P c #FC1616",
+"Q c #F08686",
+"R c #F8302D",
+"S c #F28688",
+"T c #F83D3B",
+"U c #F08180",
+"V c #CED1D1",
+"W c #F3F3F3",
+"X c #EE9795",
+"Y c #EABCBB",
+"Z c #EE908F",
+"` c #EBB3B3",
+" . c #ED9694",
+".. c #EBB1B1",
+"+. c #EF8080",
+"@. c #EAB3B3",
+"#. c #CDCECE",
+"$. c #E6E9EA",
+"%. c #E6E8E8",
+"&. c #E6E7E7",
+"*. c #E6E8E9",
+"=. c #E5E6E6",
+"-. c #E4E7E8",
+";. c #CCCCCC",
+">. c #2B2B2B",
+",. c #D6D6D6",
+"'. c #CDCDCD",
+"). c #CBCBCB",
+"!. c #B9B9B9",
+"~. c #2F2F2F",
+"{. c #292929",
+" . . . . . . . . . ",
+" . + @ # # # # # $ % & ",
+" . * = - - - - ; > , ' ) ",
+" . ! - ~ ~ ~ { ] ~ ^ / ( _ ",
+" . ! - { : : < [ } | 1 2 3 ",
+" . ! - 4 5 6 7 8 9 0 a b c ",
+" . ! d e f g h i h j k l m ",
+" . ! n o o p o o p o q r s ",
+" . t n u u v q q w x y z A ",
+" . t B o o o C o o o D E A ",
+" . t F G G H I J J K L M A ",
+" . t F N O P Q R S T U V A ",
+" . t W X Y Z ` ...+.@.#.A ",
+" . * W $.%.$.&.*.=.-.&.;.>. ",
+" . ^ ,.'.'.;.;.).).).;.!.& ",
+" >.~.m m m m m m m m {. "};
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -114,6 +114,7 @@ static const gint ToolbarIcons[] =
STOCK_PIXMAP_GO_FOLDERS,
STOCK_PIXMAP_MIME_TEXT_PLAIN,
STOCK_PIXMAP_MIME_TEXT_HTML,
+ STOCK_PIXMAP_MIME_TEXT_PATCH,
STOCK_PIXMAP_MIME_APPLICATION,
STOCK_PIXMAP_MIME_IMAGE,
STOCK_PIXMAP_MIME_AUDIO,
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -104,6 +104,7 @@
#include "pixmaps/go_folders.xpm"
#include "pixmaps/mime_text_plain.xpm"
#include "pixmaps/mime_text_html.xpm"
+#include "pixmaps/mime_text_patch.xpm"
#include "pixmaps/mime_application.xpm"
#include "pixmaps/mime_image.xpm"
#include "pixmaps/mime_audio.xpm"
@@ -330,6 +331,7 @@ static StockPixmapData pixmaps[] =
{drafts_open_mark_xpm , NULL, NULL, "drafts_open_mark", NULL},
{mime_text_plain_xpm , NULL, NULL, "mime_text_plain", NULL},
{mime_text_html_xpm , NULL, NULL, "mime_text_html", NULL},
+ {mime_text_patch_xpm , NULL, NULL, "mime_text_patch", NULL},
{mime_application_xpm , NULL, NULL, "mime_application", NULL},
{mime_image_xpm , NULL, NULL, "mime_image", NULL},
{mime_audio_xpm , NULL, NULL, "mime_audio", NULL},
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
@@ -135,6 +135,7 @@ typedef enum
STOCK_PIXMAP_DRAFTS_OPEN_MARK,
STOCK_PIXMAP_MIME_TEXT_PLAIN,
STOCK_PIXMAP_MIME_TEXT_HTML,
+ STOCK_PIXMAP_MIME_TEXT_PATCH,
STOCK_PIXMAP_MIME_APPLICATION,
STOCK_PIXMAP_MIME_IMAGE,
STOCK_PIXMAP_MIME_AUDIO,
