aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Monreal <mmonreal@svn.gnome.org>2007-11-06 18:02:42 +0800
committerMichael Monreal <mmonreal@src.gnome.org>2007-11-06 18:02:42 +0800
commite57bc4e409481165726cd503efd2405cd778c534 (patch)
tree10bb2e716a208509e177c2a963f807e36829cba6
parentaed824675f0cc43c90c43d6a0495ee952ed3a648 (diff)
downloadgsoc2013-evolution-e57bc4e409481165726cd503efd2405cd778c534.tar.gz
gsoc2013-evolution-e57bc4e409481165726cd503efd2405cd778c534.tar.zst
gsoc2013-evolution-e57bc4e409481165726cd503efd2405cd778c534.zip
** Fix for bug #492170
2007-11-06 Michael Monreal <mmonreal@svn.gnome.org> ** Fix for bug #492170 * em-migrate.c: * evolution-mail.schemas.in: * mail-config.c: Replace the old color definitions with very similar colors from the Tango color palette. svn path=/trunk/; revision=34515
-rw-r--r--mail/ChangeLog10
-rw-r--r--mail/em-migrate.c10
-rw-r--r--mail/evolution-mail.schemas.in2
-rw-r--r--mail/mail-config.c10
4 files changed, 21 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c03119a054..01f116f3b0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-06 Michael Monreal <mmonreal@svn.gnome.org>
+
+ ** Fix for bug #492170
+
+ * em-migrate.c:
+ * evolution-mail.schemas.in:
+ * mail-config.c:
+ Replace the old color definitions with very similar colors from
+ the Tango color palette.
+
2007-11-05 Milan Crha <mcrha@redhat.com>
** Fix for bug #343011
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 4e8f3e3c61..c290b60330 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -1050,11 +1050,11 @@ static struct {
char *label;
char *colour;
} label_default[5] = {
- { N_("Important"), "#ff0000" }, /* red */
- { N_("Work"), "#ff8c00" }, /* orange */
- { N_("Personal"), "#008b00" }, /* forest green */
- { N_("To Do"), "#0000ff" }, /* blue */
- { N_("Later"), "#8b008b" } /* magenta */
+ { N_("Important"), "#EF2929" }, /* red */
+ { N_("Work"), "#F57900" }, /* orange */
+ { N_("Personal"), "#4E9A06" }, /* green */
+ { N_("To Do"), "#3465A4" }, /* blue */
+ { N_("Later"), "#75507B" } /* purple */
};
/* remaps mail config from bconf to gconf */
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 56e9fcc342..f85512fac3 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -928,7 +928,7 @@
<owner>evolution-mail</owner>
<type>list</type>
<list_type>string</list_type>
- <default>[I_mportant:#ff0000,_Work:#ff8c00,_Personal:#008b00,_To Do:#0000ff,_Later:#8b008b]</default>
+ <default>[I_mportant:#EF2929,_Work:#F57900,_Personal:#4E9A06,_To Do:#3465A4,_Later:#75507B]</default>
<locale name="C">
<short>List of Labels and their associated colors</short>
<long>
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 19e46073b2..ef16f521a6 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -78,11 +78,11 @@
/* Note, the first element of each MailConfigLabel must NOT be translated */
MailConfigLabel label_defaults[5] = {
- { "important", N_("I_mportant"), "#ff0000" }, /* red */
- { "work", N_("_Work"), "#ff8c00" }, /* orange */
- { "personal", N_("_Personal"), "#008b00" }, /* forest green */
- { "todo", N_("_To Do"), "#0000ff" }, /* blue */
- { "later", N_("_Later"), "#8b008b" } /* magenta */
+ { "important", N_("I_mportant"), "#EF2929" }, /* red */
+ { "work", N_("_Work"), "#F57900" }, /* orange */
+ { "personal", N_("_Personal"), "#4E9A06" }, /* green */
+ { "todo", N_("_To Do"), "#3465A4" }, /* blue */
+ { "later", N_("_Later"), "#75507B" } /* purple */
};
typedef struct {