[Commits] [SCM] claws branch, master, updated. 3.14.0-63-g02744e9

mones at claws-mail.org mones at claws-mail.org
Mon Sep 5 09:29:20 CEST 2016


The branch, master has been updated
       via  02744e99fb4b35dbd7273fdd723608318e67b0a7 (commit)
       via  ed7e898a2aac1b351d9ebd1a192cbac4da8b0e55 (commit)
      from  6809ce7893a584f7d5a86a06959d9bbd71a8fcd3 (commit)

Summary of changes:
 src/Makefile.am                                    |   21 ++--
 src/pixmaps/claws-mail.xpm                         |  118 --------------------
 ...ompose_logo.xpm => claws_mail_compose_logo.xpm} |    0
 .../{claws-mail_icon.xpm => claws_mail_icon.xpm}   |    0
 ...aws-mail_icon_64.xpm => claws_mail_icon_64.xpm} |    0
 .../{claws-mail_logo.xpm => claws_mail_logo.xpm}   |    0
 ...il_logo-small.xpm => claws_mail_logo_small.xpm} |    0
 ...ewmail.offline.xpm => tray_newmail_offline.xpm} |    0
 ....offline.xpm => tray_newmarkedmail_offline.xpm} |    0
 ..._nomail.offline.xpm => tray_nomail_offline.xpm} |    0
 ...ail.offline.xpm => tray_unreadmail_offline.xpm} |    0
 ...fline.xpm => tray_unreadmarkedmail_offline.xpm} |    0
 src/stock_pixmap.c                                 |   30 ++---
 13 files changed, 25 insertions(+), 144 deletions(-)
 delete mode 100644 src/pixmaps/claws-mail.xpm
 rename src/pixmaps/{claws-mail_compose_logo.xpm => claws_mail_compose_logo.xpm} (100%)
 rename src/pixmaps/{claws-mail_icon.xpm => claws_mail_icon.xpm} (100%)
 rename src/pixmaps/{claws-mail_icon_64.xpm => claws_mail_icon_64.xpm} (100%)
 rename src/pixmaps/{claws-mail_logo.xpm => claws_mail_logo.xpm} (100%)
 rename src/pixmaps/{claws-mail_logo-small.xpm => claws_mail_logo_small.xpm} (100%)
 rename src/pixmaps/{tray_newmail.offline.xpm => tray_newmail_offline.xpm} (100%)
 rename src/pixmaps/{tray_newmarkedmail.offline.xpm => tray_newmarkedmail_offline.xpm} (100%)
 rename src/pixmaps/{tray_nomail.offline.xpm => tray_nomail_offline.xpm} (100%)
 rename src/pixmaps/{tray_unreadmail.offline.xpm => tray_unreadmail_offline.xpm} (100%)
 rename src/pixmaps/{tray_unreadmarkedmail.offline.xpm => tray_unreadmarkedmail_offline.xpm} (100%)


- Log -----------------------------------------------------------------
commit 02744e99fb4b35dbd7273fdd723608318e67b0a7
Author: Ricardo Mones <ricardo at mones.org>
Date:   Mon Sep 5 09:27:11 2016 +0200

    Remove unused pixmap
    
    Not used in theme and it wasn't a Claws Mail icon but other
    ancient thingy… :)

diff --git a/src/Makefile.am b/src/Makefile.am
index b109034..d46138a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -391,7 +391,6 @@ EXTRA_DIST = \
 	pixmaps/claws_mail_compose_logo.xpm \
 	pixmaps/claws_mail_logo.xpm \
 	pixmaps/claws_mail_logo_small.xpm \
-	pixmaps/claws-mail.xpm \
 	pixmaps/clip.xpm \
 	pixmaps/clip_gpg_signed.xpm \
 	pixmaps/close.xpm \
diff --git a/src/pixmaps/claws-mail.xpm b/src/pixmaps/claws-mail.xpm
deleted file mode 100644
index abe95f8..0000000
--- a/src/pixmaps/claws-mail.xpm
+++ /dev/null
@@ -1,118 +0,0 @@
-/* XPM */
-static char * claws_mail_xpm[] = {
-"50 50 65 1",
-" 	c None",
-".	c #757474",
-"+	c #6F6E6E",
-"@	c #676666",
-"#	c #605E5D",
-"$	c #595857",
-"%	c #525050",
-"&	c #4A4848",
-"*	c #424040",
-"=	c #383636",
-"-	c #C6C6C6",
-";	c #C0BFBF",
-">	c #B6B6B6",
-",	c #AFAEAD",
-"'	c #A7A6A6",
-")	c #A09E9C",
-"!	c #979695",
-"~	c #8F8E8E",
-"{	c #888888",
-"]	c #828282",
-"^	c #C3AFA3",
-"/	c #D4B59C",
-"(	c #DBC3AE",
-"_	c #EDD1A6",
-":	c #F6DCAC",
-"<	c #7D7C7C",
-"[	c #FEE7B1",
-"}	c #B6A49A",
-"|	c #C7A389",
-"1	c #EAC68F",
-"2	c #FEE09A",
-"3	c #FEDD8D",
-"4	c #FDD780",
-"5	c #FED36C",
-"6	c #A8968A",
-"7	c #8B817B",
-"8	c #272626",
-"9	c #BE977F",
-"0	c #FACC6A",
-"a	c #E9B961",
-"b	c #C18C58",
-"c	c #89715B",
-"d	c #B57E53",
-"e	c #B07448",
-"f	c #F0C26B",
-"g	c #9D6443",
-"h	c #6A5449",
-"i	c #8C5C40",
-"j	c #A66C47",
-"k	c #7F5A43",
-"l	c #604A3F",
-"m	c #FAD587",
-"n	c #E5B25C",
-"o	c #D9A75E",
-"p	c #8D634C",
-"q	c #7A655B",
-"r	c #FED57A",
-"s	c #CA9963",
-"t	c #9C8C82",
-"u	c #E0B576",
-"v	c #A87D65",
-"w	c #927464",
-"x	c #9D725A",
-"y	c #1B1A1A",
-"z	c #0E0E0E",
-".....++++++@@@@@@@#####$$$$$$%$%%%%%&%&&&&&*&*****",
-".$$$$$$$$%%$$$%%%%$%%%%$%%%%%%%%%%&&%&&%&&&&&&&&&=",
-".$-----;;-;;>;>>>>,>,,',''')))))!)!!!!~~~~~{~{{]&*",
-".$----;-;>;>>>>>>,,,,,,',')')))!)!!!!~!~~~~{{{]]&=",
-"+#---;;;;;>;>>>,>,,,^//(//'')))!)!!!!~~~~{{{{{{]&=",
-"+$-;-;;;>;>>>>,>^>^(/(_:_//^)))!!!!~~~~~{{{{]]]<&=",
-"+$-;-;;;>>>>>>>>/((((:[[[_//})!!!!~!~~~~{{{{]]]<&=",
-"+%-;;;>;>;>>^>/(((_[[[[[[[_//})!!!~~~~{{{{]]]<]<&=",
-"+$-;;;>>>>>;((((:[[[[[[[[[:_^|)!~!~~~~{{{{]]]<]<&=",
-"+%;;>>;>>>>/(_[[[[[[[[[[[[[:1/}!~~~~{{{{]]{<]<<<*=",
-"+%;;;>>>>,>(_[[[[[[[[[[[[[[2:1|)~~~~{{{{]]]<]<<<*=",
-"@$;>>>>>>>>^(-[[[[[:_[[[2234441)~~~{{{{]]]<]<<..*=",
-"@%;;>>>>,,>^((_[[[[:/(:223455516{{{{{]{]7]<<<<<<*8",
-"@$>>>>,>,,,'/-:[[[[:/9|145500abc.{{{{{]]<<<<....&=",
-"@$>>>>>,,,,'^(_[[[[19debf050abgh#.]]]7]]<<<<<...*8",
-"@%>>>,,,,',',(_[[2:fdgijbf0abgkl%#+<]<<<<<......&8",
-"@$>>>,,,,''',/_[[[madkkgdaabggkllh at +<<<<<<<....+&8",
-"@%>,,,,,',''};_[[23aeiien0odeddejpiq.<<<<.....+.&8",
-"#%>>,,,''''''/_[[[2fdgeo5r00aaanosbdt7<<<<...++@&8",
-"@%,,',',''''}/_[[[2fees04334555005fu|b{.....++++*8",
-"#%,,,''''')'^/_[[[:fbsf5r32345555r431|9<...+++ at +&8",
-"#$,,',,')''}/^_[2[2fnf0543[23455533331|v.++++ at +@*8",
-"$%,''''''))}^/_[[2240505532[345r433333us7.+++@@@*8",
-"#%',''''))'//_[[2[2555fnoa11fff5r44434m|v+++ at +@@*8",
-"$%,''')')))^/_:[2[245fsdeb99bbbof5r5rrrod++@@@@@*8",
-"#%''')'))!)}|/(12225fbjgwvbdssejba05505odq#+@@@@=8",
-"$%'')'))))!))9}^(13fsggkqxdof0odjbf5505aek#@@@#@*8",
-"$%')')))))!!!)6||/mfbjgkkjsf000seen0050neh%$#@@#*y",
-"$%')))))!)!!!6}|11m5aobegjbf550sjgo0550ajl&%$###*y",
-"%%)')!)!!!!!}|/_:3r5000nsjjsf5adgjo0055nel*%$###*y",
-"%%)))!))!!!6|/m2224450500nbbou9cweo0555ne&**%$##*y",
-"$%))))!!!!6|(:22[2335550050usbtwwen5455nj***%$$$*y",
-"%%))!!!!!~)/m[22mmm234555r431sbvxdarrr5si***&$$$*y",
-"%%)!!!!!~6}12:1/^o^u0445544m:u9vdo0544adl***&%$$*y",
-"%%!)!!!!~!^:_/||99999of555rr44uonf555abq****&%$%=y",
-"&%!!!!~~~~|1||96t{7wxebn0555rrm5r550obeh&=**&%%$*y",
-"&%!!~!!~~!}|96t{<+#hhigdo055055445asbwq%****&%%%=y",
-"%%!!!~~~~{t~~{77.@%**lkgeo0050550o9vx+$&****&%$%*z",
-"&%!~~~~~~{{{7]<.@%&&&%hijeo0500obeecq#%&*=**&%%%*z",
-"%&~!~~~{{{{]]]<+$%%$##@#qjdo0nbjgk#$$%&***&&&%%%=y",
-"&%~~~~{{{{{{]]<@$$@+.+.+ at qqppkhl&**&%&****&%%%&%=z",
-"&&!~~{~{{]]]]<<.@@+...+++@@#%&**********&&%&%%%&*z",
-"&&~~~{{{{]]<]<.<.......++@@@$%***=******%%%%&&&&*z",
-"&&~{{{{7]]<]<<<.<..+.+++++@@#$%*******%&%%%%%%&&=z",
-"&%~{{{{{]]<]<<<.<..+.++ at +@@@##$&&**&&%%%%%&%&&&&=z",
-"*&{{{{]]]]]<<<.<+..++ at ++@@@@#@$$&&&&%%$%%%%&&&&&=z",
-"*%{{{]]]]<<<<<...+.++@@+@@@@##$$$%%$%%%%%&&%&&*&=z",
-"*&{]]{]<<<<......+++++@@@@@####$$$$$$%%%%%&&&&&*=z",
-"*&&&&&&&&&&&&&&*&*&**&************=*=*===*=======z",
-"****=========88=8=8888888888yyyyyyyyyyyyzzzzzzzzzz"};

commit ed7e898a2aac1b351d9ebd1a192cbac4da8b0e55
Author: Ricardo Mones <ricardo at mones.org>
Date:   Mon Sep 5 09:21:40 2016 +0200

    Normalise theme icon names which were different

diff --git a/src/Makefile.am b/src/Makefile.am
index a5d76ea..b109034 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -386,11 +386,11 @@ EXTRA_DIST = \
 	pixmaps/checkbox_on.xpm \
 	pixmaps/check_spelling.xpm \
 	pixmaps/clipkey.xpm \
-	pixmaps/claws-mail_icon.xpm \
-	pixmaps/claws-mail_icon_64.xpm \
-	pixmaps/claws-mail_compose_logo.xpm \
-	pixmaps/claws-mail_logo.xpm \
-	pixmaps/claws-mail_logo-small.xpm \
+	pixmaps/claws_mail_icon.xpm \
+	pixmaps/claws_mail_icon_64.xpm \
+	pixmaps/claws_mail_compose_logo.xpm \
+	pixmaps/claws_mail_logo.xpm \
+	pixmaps/claws_mail_logo_small.xpm \
 	pixmaps/claws-mail.xpm \
 	pixmaps/clip.xpm \
 	pixmaps/clip_gpg_signed.xpm \
@@ -530,15 +530,15 @@ EXTRA_DIST = \
 	pixmaps/moved.xpm \
 	pixmaps/copied.xpm \
 	pixmaps/watchthread.xpm \
-	pixmaps/tray_newmail.offline.xpm \
+	pixmaps/tray_newmail_offline.xpm \
 	pixmaps/tray_newmail.xpm \
-	pixmaps/tray_newmarkedmail.offline.xpm \
+	pixmaps/tray_newmarkedmail_offline.xpm \
 	pixmaps/tray_newmarkedmail.xpm \
-	pixmaps/tray_nomail.offline.xpm \
+	pixmaps/tray_nomail_offline.xpm \
 	pixmaps/tray_nomail.xpm \
-	pixmaps/tray_unreadmail.offline.xpm \
+	pixmaps/tray_unreadmail_offline.xpm \
 	pixmaps/tray_unreadmail.xpm \
-	pixmaps/tray_unreadmarkedmail.offline.xpm \
+	pixmaps/tray_unreadmarkedmail_offline.xpm \
 	pixmaps/tray_unreadmarkedmail.xpm \
 	pixmaps/empty.xpm \
 	pixmaps/replied_and_forwarded.xpm \
diff --git a/src/pixmaps/claws-mail_compose_logo.xpm b/src/pixmaps/claws_mail_compose_logo.xpm
similarity index 100%
rename from src/pixmaps/claws-mail_compose_logo.xpm
rename to src/pixmaps/claws_mail_compose_logo.xpm
diff --git a/src/pixmaps/claws-mail_icon.xpm b/src/pixmaps/claws_mail_icon.xpm
similarity index 100%
rename from src/pixmaps/claws-mail_icon.xpm
rename to src/pixmaps/claws_mail_icon.xpm
diff --git a/src/pixmaps/claws-mail_icon_64.xpm b/src/pixmaps/claws_mail_icon_64.xpm
similarity index 100%
rename from src/pixmaps/claws-mail_icon_64.xpm
rename to src/pixmaps/claws_mail_icon_64.xpm
diff --git a/src/pixmaps/claws-mail_logo.xpm b/src/pixmaps/claws_mail_logo.xpm
similarity index 100%
rename from src/pixmaps/claws-mail_logo.xpm
rename to src/pixmaps/claws_mail_logo.xpm
diff --git a/src/pixmaps/claws-mail_logo-small.xpm b/src/pixmaps/claws_mail_logo_small.xpm
similarity index 100%
rename from src/pixmaps/claws-mail_logo-small.xpm
rename to src/pixmaps/claws_mail_logo_small.xpm
diff --git a/src/pixmaps/tray_newmail.offline.xpm b/src/pixmaps/tray_newmail_offline.xpm
similarity index 100%
rename from src/pixmaps/tray_newmail.offline.xpm
rename to src/pixmaps/tray_newmail_offline.xpm
diff --git a/src/pixmaps/tray_newmarkedmail.offline.xpm b/src/pixmaps/tray_newmarkedmail_offline.xpm
similarity index 100%
rename from src/pixmaps/tray_newmarkedmail.offline.xpm
rename to src/pixmaps/tray_newmarkedmail_offline.xpm
diff --git a/src/pixmaps/tray_nomail.offline.xpm b/src/pixmaps/tray_nomail_offline.xpm
similarity index 100%
rename from src/pixmaps/tray_nomail.offline.xpm
rename to src/pixmaps/tray_nomail_offline.xpm
diff --git a/src/pixmaps/tray_unreadmail.offline.xpm b/src/pixmaps/tray_unreadmail_offline.xpm
similarity index 100%
rename from src/pixmaps/tray_unreadmail.offline.xpm
rename to src/pixmaps/tray_unreadmail_offline.xpm
diff --git a/src/pixmaps/tray_unreadmarkedmail.offline.xpm b/src/pixmaps/tray_unreadmarkedmail_offline.xpm
similarity index 100%
rename from src/pixmaps/tray_unreadmarkedmail.offline.xpm
rename to src/pixmaps/tray_unreadmarkedmail_offline.xpm
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 30fa8ba..c356be9 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -84,13 +84,13 @@
 #include "pixmaps/queue_close_hrm.xpm"
 #include "pixmaps/queue_open.xpm"
 #include "pixmaps/queue_open_hrm.xpm"
-#include "pixmaps/claws-mail_icon.xpm"
-#include "pixmaps/claws-mail_icon_64.xpm"
-#include "pixmaps/claws-mail_compose_logo.xpm"
+#include "pixmaps/claws_mail_icon.xpm"
+#include "pixmaps/claws_mail_icon_64.xpm"
+#include "pixmaps/claws_mail_compose_logo.xpm"
 #ifndef GENERIC_UMPC
-#include "pixmaps/claws-mail_logo.xpm"
+#include "pixmaps/claws_mail_logo.xpm"
 #else
-#include "pixmaps/claws-mail_logo-small.xpm"
+#include "pixmaps/claws_mail_logo_small.xpm"
 #endif
 #include "pixmaps/address_book.xpm"
 #include "pixmaps/unread.xpm"
@@ -187,15 +187,15 @@
 #include "pixmaps/selection.xpm"
 #include "pixmaps/watchthread.xpm"
 #include "pixmaps/empty.xpm"
-#include "pixmaps/tray_newmail.offline.xpm"
+#include "pixmaps/tray_newmail_offline.xpm"
 #include "pixmaps/tray_newmail.xpm"
-#include "pixmaps/tray_newmarkedmail.offline.xpm"
+#include "pixmaps/tray_newmarkedmail_offline.xpm"
 #include "pixmaps/tray_newmarkedmail.xpm"
-#include "pixmaps/tray_nomail.offline.xpm"
+#include "pixmaps/tray_nomail_offline.xpm"
 #include "pixmaps/tray_nomail.xpm"
-#include "pixmaps/tray_unreadmail.offline.xpm"
+#include "pixmaps/tray_unreadmail_offline.xpm"
 #include "pixmaps/tray_unreadmail.xpm"
-#include "pixmaps/tray_unreadmarkedmail.offline.xpm"
+#include "pixmaps/tray_unreadmarkedmail_offline.xpm"
 #include "pixmaps/tray_unreadmarkedmail.xpm"
 
 typedef struct _StockPixmapData	StockPixmapData;
@@ -396,15 +396,15 @@ static StockPixmapData pixmaps[] =
 	{copied_xpm				, NULL, NULL, "copied", NULL},
 	{selection_xpm				, NULL, NULL, "selection", NULL},
 	{watchthread_xpm			, NULL, NULL, "watchthread", NULL},
-	{tray_newmail_offline_xpm		, NULL, NULL, "tray_newmail.offline", NULL},
+	{tray_newmail_offline_xpm		, NULL, NULL, "tray_newmail_offline", NULL},
 	{tray_newmail_xpm			, NULL, NULL, "tray_newmail", NULL},
-	{tray_newmarkedmail_offline_xpm		, NULL, NULL, "tray_newmarkedmail.offline", NULL},
+	{tray_newmarkedmail_offline_xpm		, NULL, NULL, "tray_newmarkedmail_offline", NULL},
 	{tray_newmarkedmail_xpm			, NULL, NULL, "tray_newmarkedmail", NULL},
-	{tray_nomail_offline_xpm		, NULL, NULL, "tray_nomail.offline", NULL},
+	{tray_nomail_offline_xpm		, NULL, NULL, "tray_nomail_offline", NULL},
 	{tray_nomail_xpm			, NULL, NULL, "tray_nomail", NULL},
-	{tray_unreadmail_offline_xpm		, NULL, NULL, "tray_unreadmail.offline", NULL},
+	{tray_unreadmail_offline_xpm		, NULL, NULL, "tray_unreadmail_offline", NULL},
 	{tray_unreadmail_xpm			, NULL, NULL, "tray_unreadmail", NULL},
-	{tray_unreadmarkedmail_offline_xpm	, NULL, NULL, "tray_unreadmarkedmail.offline", NULL},
+	{tray_unreadmarkedmail_offline_xpm	, NULL, NULL, "tray_unreadmarkedmail_offline", NULL},
 	{tray_unreadmarkedmail_xpm		, NULL, NULL, "tray_unreadmarkedmail", NULL},
         {empty_xpm                              , NULL, NULL, "empty" , NULL}
 };

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list