diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-04-02 12:19:25 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-04-02 12:19:25 +0800 |
| commit | b5365bc587c99c0eb18293c4e70029782a185d56 (patch) | |
| tree | c28ff26a508bcb3195b7b74868540f3c9ffc1458 /filter/filter-element.c | |
| parent | 7dd3f720c743488c2aac7b6a1cfcdb97b1c1ac70 (diff) | |
| download | gsoc2013-evolution-b5365bc587c99c0eb18293c4e70029782a185d56.tar.gz gsoc2013-evolution-b5365bc587c99c0eb18293c4e70029782a185d56.tar.zst gsoc2013-evolution-b5365bc587c99c0eb18293c4e70029782a185d56.zip | |
** Fixes bug #373116
2007-04-01 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #373116
* calendar/gui/calendar-component.c (ensure_sources):
* calendar/gui/e-cal-model.c (ecm_get_color_for_component):
* calendar/gui/memos-component.c (ensure_sources):
* calendar/gui/migration.c (create_calendar_contact_source),
(create_calendar_sources), (create_task_sources),
(create_memo_sources), (add_gw_esource):
* calendar/gui/tasks-component.c (ensure_sources):
* plugins/groupwise-account-setup/camel-gw-listener.c (add_esource):
Use the new ESource color API.
* calendar/gui/dialogs/cal-prefs-dialog.c:
* calendar/gui/dialogs/cal-prefs-dialog.glade:
* calendar/gui/dialogs/calendar-setup.c:
* calendar/gui/dialogs/calendar-setup.glade:
* filter-colour.c (get_widget):
* mail/em-composer-prefs.c:
* mail/em-composer-prefs.h:
* mail/em-mailer-prefs.c:
* mail/em-mailer-prefs.h:
* mail/mail-config.glade:
Migrate from GnomeColorPicker to GtkColorButton.
* filter/filter-colour.h:
Store color as a GdkColor instead of separate RGBA components.
* filter/filter-colour.c (color_eq):
Use gdk_color_equal() to compare colors.
* filter/filter-colour.c (xml_encode):
Encode color as a single property ("spec").
* filter/filter-colour.c (xml_decode):
Read the color from a single property ("spec").
Provide a migration path for old XML files.
* calendar/gui/calendar-component.c
(calendar_config_get_tasks_due_today_color),
(calendar_config_get_tasks_overdue_color):
Return a GdkColor instead of an X color specification.
* calendar/gui/calendar-component.c
(calendar_config_set_tasks_due_today_color),
(calendar_config_set_tasks_overdue_color):
Accept a GdkColor instead of an X color specification.
* calenar/gui/e-cal-model-tasks.c (ecmt_get_color_for_component):
Adapt to modified color API in calendar-component.c by converting
the GdkColor to an X color specification. This is an ugly hack to
be fixed later.
svn path=/trunk/; revision=33349
Diffstat (limited to 'filter/filter-element.c')
| -rw-r--r-- | filter/filter-element.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/filter/filter-element.c b/filter/filter-element.c index 11b848216f..60ca789a69 100644 --- a/filter/filter-element.c +++ b/filter/filter-element.c @@ -293,12 +293,10 @@ copy_value(FilterElement *de, FilterElement *se) } } else if (IS_FILTER_COLOUR(se)) { if (IS_FILTER_COLOUR(de)) { - FilterColour *s = (FilterColour *)se, *d = (FilterColour *)de; + FilterColour *s = (FilterColour *)se; + FilterColour *d = (FilterColour *)de; - d->r = s->r; - d->g = s->g; - d->b = s->b; - d->a = s->a; + d->color = s->color; } } else if (IS_FILTER_DATESPEC(se)) { if (IS_FILTER_DATESPEC(de)) { |