[Commits] [SCM] claws branch, master, updated. 3.14.0-65-g831b8da
mones at claws-mail.org
mones at claws-mail.org
Wed Sep 7 14:09:22 CEST 2016
The branch, master has been updated
via 831b8da1ebf3eabcae4c9cea8a72daf19aaeed25 (commit)
from a79bdb6a077a38737e0e54095474b6eb3fd6c3e3 (commit)
Summary of changes:
src/Makefile.am | 12 ++++++---
src/pixmaps/{trash.xpm => trash_close.xpm} | 2 +-
src/pixmaps/{trash_hrm.xpm => trash_close_hrm.xpm} | 2 +-
...trash_hrm_mark.xpm => trash_close_hrm_mark.xpm} | 2 +-
.../{trash_mark.xpm => trash_close_mark.xpm} | 2 +-
src/pixmaps/{trash.xpm => trash_open.xpm} | 2 +-
src/pixmaps/{trash_hrm.xpm => trash_open_hrm.xpm} | 2 +-
...{trash_hrm_mark.xpm => trash_open_hrm_mark.xpm} | 2 +-
.../{trash_mark.xpm => trash_open_mark.xpm} | 2 +-
src/stock_pixmap.c | 28 +++++++++++---------
10 files changed, 32 insertions(+), 24 deletions(-)
copy src/pixmaps/{trash.xpm => trash_close.xpm} (93%)
copy src/pixmaps/{trash_hrm.xpm => trash_close_hrm.xpm} (92%)
copy src/pixmaps/{trash_hrm_mark.xpm => trash_close_hrm_mark.xpm} (91%)
copy src/pixmaps/{trash_mark.xpm => trash_close_mark.xpm} (92%)
rename src/pixmaps/{trash.xpm => trash_open.xpm} (93%)
rename src/pixmaps/{trash_hrm.xpm => trash_open_hrm.xpm} (92%)
rename src/pixmaps/{trash_hrm_mark.xpm => trash_open_hrm_mark.xpm} (92%)
rename src/pixmaps/{trash_mark.xpm => trash_open_mark.xpm} (92%)
- Log -----------------------------------------------------------------
commit 831b8da1ebf3eabcae4c9cea8a72daf19aaeed25
Author: Ricardo Mones <ricardo at mones.org>
Date: Wed Sep 7 14:08:55 2016 +0200
Do not reuse pixmaps for theme icons
Otherwise theme authors may have a hard time finding why an
icon is not themed despite having provided replacements for
all existing xpm files.
diff --git a/src/Makefile.am b/src/Makefile.am
index c5a66ed..8ccd8e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -506,8 +506,10 @@ EXTRA_DIST = \
pixmaps/selection.xpm \
pixmaps/spam.xpm \
pixmaps/spam_btn.xpm \
- pixmaps/trash_hrm.xpm \
- pixmaps/trash.xpm \
+ pixmaps/trash_open_hrm.xpm \
+ pixmaps/trash_close_hrm.xpm \
+ pixmaps/trash_open.xpm \
+ pixmaps/trash_close.xpm \
pixmaps/trash_btn.xpm \
pixmaps/unread.xpm \
pixmaps/read.xpm \
@@ -523,8 +525,10 @@ EXTRA_DIST = \
pixmaps/inbox_open_mark.xpm \
pixmaps/inbox_close_hrm_mark.xpm \
pixmaps/inbox_close_mark.xpm \
- pixmaps/trash_hrm_mark.xpm \
- pixmaps/trash_mark.xpm \
+ pixmaps/trash_open_hrm_mark.xpm \
+ pixmaps/trash_close_hrm_mark.xpm \
+ pixmaps/trash_open_mark.xpm \
+ pixmaps/trash_close_mark.xpm \
pixmaps/moved.xpm \
pixmaps/copied.xpm \
pixmaps/watchthread.xpm \
diff --git a/src/pixmaps/trash.xpm b/src/pixmaps/trash_close.xpm
similarity index 93%
copy from src/pixmaps/trash.xpm
copy to src/pixmaps/trash_close.xpm
index a201902..9405ed7 100644
--- a/src/pixmaps/trash.xpm
+++ b/src/pixmaps/trash_close.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * trash_xpm[] = {
+static char * trash_close_xpm[] = {
"16 16 10 1",
" c None",
". c #000000",
diff --git a/src/pixmaps/trash_hrm.xpm b/src/pixmaps/trash_close_hrm.xpm
similarity index 92%
copy from src/pixmaps/trash_hrm.xpm
copy to src/pixmaps/trash_close_hrm.xpm
index e81a9dc..254c7f4 100644
--- a/src/pixmaps/trash_hrm.xpm
+++ b/src/pixmaps/trash_close_hrm.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * trash_hrm_xpm[] = {
+static char * trash_close_hrm_xpm[] = {
"16 16 11 1",
" c None",
". c #000000",
diff --git a/src/pixmaps/trash_hrm_mark.xpm b/src/pixmaps/trash_close_hrm_mark.xpm
similarity index 91%
copy from src/pixmaps/trash_hrm_mark.xpm
copy to src/pixmaps/trash_close_hrm_mark.xpm
index 6527677..755e6c9 100644
--- a/src/pixmaps/trash_hrm_mark.xpm
+++ b/src/pixmaps/trash_close_hrm_mark.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * trash_hrm_mark_xpm[] = {
+static char * trash_close_hrm_mark_xpm[] = {
"16 16 11 1",
" c None",
". c #FFFFFF",
diff --git a/src/pixmaps/trash_mark.xpm b/src/pixmaps/trash_close_mark.xpm
similarity index 92%
copy from src/pixmaps/trash_mark.xpm
copy to src/pixmaps/trash_close_mark.xpm
index 1cc68e6..9bdad74 100644
--- a/src/pixmaps/trash_mark.xpm
+++ b/src/pixmaps/trash_close_mark.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * trash_mark_xpm[] = {
+static char * trash_close_mark_xpm[] = {
"16 16 11 1",
" c None",
". c #FFFFFF",
diff --git a/src/pixmaps/trash.xpm b/src/pixmaps/trash_open.xpm
similarity index 93%
rename from src/pixmaps/trash.xpm
rename to src/pixmaps/trash_open.xpm
index a201902..628b5bf 100644
--- a/src/pixmaps/trash.xpm
+++ b/src/pixmaps/trash_open.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * trash_xpm[] = {
+static char * trash_open_xpm[] = {
"16 16 10 1",
" c None",
". c #000000",
diff --git a/src/pixmaps/trash_hrm.xpm b/src/pixmaps/trash_open_hrm.xpm
similarity index 92%
rename from src/pixmaps/trash_hrm.xpm
rename to src/pixmaps/trash_open_hrm.xpm
index e81a9dc..bc03a9f 100644
--- a/src/pixmaps/trash_hrm.xpm
+++ b/src/pixmaps/trash_open_hrm.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * trash_hrm_xpm[] = {
+static char * trash_open_hrm_xpm[] = {
"16 16 11 1",
" c None",
". c #000000",
diff --git a/src/pixmaps/trash_hrm_mark.xpm b/src/pixmaps/trash_open_hrm_mark.xpm
similarity index 92%
rename from src/pixmaps/trash_hrm_mark.xpm
rename to src/pixmaps/trash_open_hrm_mark.xpm
index 6527677..1a89969 100644
--- a/src/pixmaps/trash_hrm_mark.xpm
+++ b/src/pixmaps/trash_open_hrm_mark.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * trash_hrm_mark_xpm[] = {
+static char * trash_open_hrm_mark_xpm[] = {
"16 16 11 1",
" c None",
". c #FFFFFF",
diff --git a/src/pixmaps/trash_mark.xpm b/src/pixmaps/trash_open_mark.xpm
similarity index 92%
rename from src/pixmaps/trash_mark.xpm
rename to src/pixmaps/trash_open_mark.xpm
index 1cc68e6..ec14a21 100644
--- a/src/pixmaps/trash_mark.xpm
+++ b/src/pixmaps/trash_open_mark.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * trash_mark_xpm[] = {
+static char * trash_open_mark_xpm[] = {
"16 16 11 1",
" c None",
". c #FFFFFF",
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index c356be9..c3a21de 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -146,11 +146,13 @@
#include "pixmaps/outbox_open_hrm.xpm"
#include "pixmaps/outbox_close.xpm"
#include "pixmaps/outbox_close_hrm.xpm"
-#include "pixmaps/trash.xpm"
+#include "pixmaps/trash_open.xpm"
+#include "pixmaps/trash_close.xpm"
#include "pixmaps/delete_btn.xpm"
#include "pixmaps/cancel.xpm"
#include "pixmaps/trash_btn.xpm"
-#include "pixmaps/trash_hrm.xpm"
+#include "pixmaps/trash_open_hrm.xpm"
+#include "pixmaps/trash_close_hrm.xpm"
#include "pixmaps/drafts_close.xpm"
#include "pixmaps/drafts_open.xpm"
#include "pixmaps/dir_close_mark.xpm"
@@ -165,12 +167,14 @@
#include "pixmaps/outbox_open_hrm_mark.xpm"
#include "pixmaps/outbox_close_mark.xpm"
#include "pixmaps/outbox_close_hrm_mark.xpm"
-#include "pixmaps/trash_mark.xpm"
+#include "pixmaps/trash_open_mark.xpm"
+#include "pixmaps/trash_close_mark.xpm"
#include "pixmaps/queue_close_mark.xpm"
#include "pixmaps/queue_close_hrm_mark.xpm"
#include "pixmaps/queue_open_mark.xpm"
#include "pixmaps/queue_open_hrm_mark.xpm"
-#include "pixmaps/trash_hrm_mark.xpm"
+#include "pixmaps/trash_open_hrm_mark.xpm"
+#include "pixmaps/trash_close_hrm_mark.xpm"
#include "pixmaps/drafts_close_mark.xpm"
#include "pixmaps/drafts_open_mark.xpm"
#include "pixmaps/dir_noselect_close.xpm"
@@ -320,18 +324,18 @@ static StockPixmapData pixmaps[] =
{queue_close_hrm_xpm , NULL, NULL, "queue_close_hrm", NULL},
{queue_open_xpm , NULL, NULL, "queue_open", NULL},
{queue_open_hrm_xpm , NULL, NULL, "queue_open_hrm", NULL},
- {trash_xpm , NULL, NULL, "trash_open", NULL},
- {trash_hrm_xpm , NULL, NULL, "trash_open_hrm", NULL},
- {trash_xpm , NULL, NULL, "trash_close", NULL},
- {trash_hrm_xpm , NULL, NULL, "trash_close_hrm", NULL},
+ {trash_open_xpm , NULL, NULL, "trash_open", NULL},
+ {trash_open_hrm_xpm , NULL, NULL, "trash_open_hrm", NULL},
+ {trash_close_xpm , NULL, NULL, "trash_close", NULL},
+ {trash_close_hrm_xpm , NULL, NULL, "trash_close_hrm", NULL},
{queue_close_mark_xpm , NULL, NULL, "queue_close_mark", NULL},
{queue_close_hrm_mark_xpm , NULL, NULL, "queue_close_hrm_mark", NULL},
{queue_open_mark_xpm , NULL, NULL, "queue_open_mark", NULL},
{queue_open_hrm_mark_xpm , NULL, NULL, "queue_open_hrm_mark", NULL},
- {trash_mark_xpm , NULL, NULL, "trash_open_mark", NULL},
- {trash_hrm_mark_xpm , NULL, NULL, "trash_open_hrm_mark", NULL},
- {trash_mark_xpm , NULL, NULL, "trash_close_mark", NULL},
- {trash_hrm_mark_xpm , NULL, NULL, "trash_close_hrm_mark", NULL},
+ {trash_open_mark_xpm , NULL, NULL, "trash_open_mark", NULL},
+ {trash_open_hrm_mark_xpm , NULL, NULL, "trash_open_hrm_mark", NULL},
+ {trash_close_mark_xpm , NULL, NULL, "trash_close_mark", NULL},
+ {trash_close_hrm_mark_xpm , NULL, NULL, "trash_close_hrm_mark", NULL},
{unread_xpm , NULL, NULL, "unread", NULL},
{vcard_xpm , NULL, NULL, "vcard", NULL},
{online_xpm , NULL, NULL, "online", NULL},
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list