callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

** Fix for bug #492170

Browse Source 
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
This commit is contained in:
Michael Monreal
2007-11-06 10:02:42 +00:00
committed by Michael Monreal
parent aed824675f
commit e57bc4e409
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mail/ChangeLog
View File

@ -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

10
mail/em-migrate.c
View File

@ -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 */

2
mail/evolution-mail.schemas.in
View File

@ -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>

10
mail/mail-config.c
View File

@ -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 {