[Commits] [SCM] claws branch, master, updated. 3.14.1-191-g50bd87f
mones at claws-mail.org
mones at claws-mail.org
Sat Feb 11 16:50:24 CET 2017
The branch, master has been updated
via 50bd87f2e13a9dbdb2a1a449823ff16ae87239f8 (commit)
from 579f91dc8bd600e9197a747dc152ab1383601a94 (commit)
Summary of changes:
src/Makefile.am | 2 +-
src/pixmaps/{mail.xpm => mail_draft.xpm} | 2 +-
src/prefs_toolbar.c | 7 +++----
src/prefs_toolbar.h | 5 ++---
src/stock_pixmap.c | 4 ++--
src/stock_pixmap.h | 2 +-
src/toolbar.c | 7 +++----
src/toolbar.h | 5 ++---
8 files changed, 15 insertions(+), 19 deletions(-)
rename src/pixmaps/{mail.xpm => mail_draft.xpm} (97%)
- Log -----------------------------------------------------------------
commit 50bd87f2e13a9dbdb2a1a449823ff16ae87239f8
Author: Ricardo Mones <ricardo at mones.org>
Date: Sat Feb 11 16:47:50 2017 +0100
Fix pixmap name to reflect what it really does
Will break your themes, nothing a mv cannot fix ;-)
diff --git a/src/Makefile.am b/src/Makefile.am
index ba1b837..5489c6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -465,7 +465,7 @@ EXTRA_DIST = \
pixmaps/mail_send_queue.xpm \
pixmaps/mail_send.xpm \
pixmaps/mail_sign.xpm \
- pixmaps/mail.xpm \
+ pixmaps/mail_draft.xpm \
pixmaps/mark.xpm \
pixmaps/mark_allread.xpm \
pixmaps/mark_allunread.xpm \
diff --git a/src/pixmaps/mail.xpm b/src/pixmaps/mail_draft.xpm
similarity index 97%
rename from src/pixmaps/mail.xpm
rename to src/pixmaps/mail_draft.xpm
index 8f95577..a06e233 100644
--- a/src/pixmaps/mail.xpm
+++ b/src/pixmaps/mail_draft.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * mail_xpm[] = {
+static char * mail_draft_xpm[] = {
"24 24 55 1",
" c None",
". c #000000",
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index b59c1b4..d05b050 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2015 Hiroyuki Yamamoto & the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2002-2017 Hiroyuki Yamamoto & the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
/*
@@ -92,7 +91,7 @@ static const gint ToolbarIcons[] =
STOCK_PIXMAP_LDAP,
STOCK_PIXMAP_LINEWRAP_CURRENT,
STOCK_PIXMAP_LINEWRAP_ALL,
- STOCK_PIXMAP_MAIL,
+ STOCK_PIXMAP_MAIL_DRAFT,
STOCK_PIXMAP_MAIL_ATTACH,
STOCK_PIXMAP_MAIL_COMPOSE,
STOCK_PIXMAP_MAIL_FORWARD,
diff --git a/src/prefs_toolbar.h b/src/prefs_toolbar.h
index d3a369a..aef7386 100644
--- a/src/prefs_toolbar.h
+++ b/src/prefs_toolbar.h
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifndef __PREFS_CUSTOM_TOOLBAR_H__
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 8cc299e..007864d 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -70,7 +70,7 @@
#include "pixmaps/down_arrow.xpm"
#include "pixmaps/up_arrow.xpm"
#include "pixmaps/exec.xpm"
-#include "pixmaps/mail.xpm"
+#include "pixmaps/mail_draft.xpm"
#include "pixmaps/mail_attach.xpm"
#include "pixmaps/mail_compose.xpm"
#include "pixmaps/mail_forward.xpm"
@@ -321,7 +321,7 @@ static StockPixmapData pixmaps[] =
{linewrapcurrent_xpm , NULL, NULL, "linewrapcurrent", NULL, NULL},
{linewrap_xpm , NULL, NULL, "linewrap", NULL, NULL},
{locked_xpm , NULL, NULL, "locked", NULL, NULL},
- {mail_xpm , NULL, NULL, "mail", NULL, NULL},
+ {mail_draft_xpm , NULL, NULL, "mail_draft", NULL, NULL},
{mail_attach_xpm , NULL, NULL, "mail_attach", NULL, NULL},
{mail_compose_xpm , NULL, NULL, "mail_compose", NULL, NULL},
{mail_forward_xpm , NULL, NULL, "mail_forward", NULL, NULL},
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 447e5da..582b4fa 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -75,7 +75,7 @@ typedef enum
STOCK_PIXMAP_LINEWRAP_CURRENT,
STOCK_PIXMAP_LINEWRAP_ALL,
STOCK_PIXMAP_LOCKED,
- STOCK_PIXMAP_MAIL,
+ STOCK_PIXMAP_MAIL_DRAFT,
STOCK_PIXMAP_MAIL_ATTACH,
STOCK_PIXMAP_MAIL_COMPOSE,
STOCK_PIXMAP_MAIL_FORWARD,
diff --git a/src/toolbar.c b/src/toolbar.c
index a182d4e..32b76cc 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2001-2017 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
/*
@@ -573,7 +572,7 @@ gint toolbar_get_icon(int action) {
case A_SEND: return STOCK_PIXMAP_MAIL_SEND;
case A_SEND_LATER: return STOCK_PIXMAP_MAIL_SEND_QUEUE;
- case A_DRAFT: return STOCK_PIXMAP_MAIL;
+ case A_DRAFT: return STOCK_PIXMAP_MAIL_DRAFT;
case A_INSERT: return STOCK_PIXMAP_INSERT_FILE;
case A_ATTACH: return STOCK_PIXMAP_MAIL_ATTACH;
case A_SIG: return STOCK_PIXMAP_MAIL_SIGN;
diff --git a/src/toolbar.h b/src/toolbar.h
index 6047a88..c9aaf4f 100644
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2001-2017 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifndef __CUSTOM_TOOLBAR_H__
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list