From b5365bc587c99c0eb18293c4e70029782a185d56 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 2 Apr 2007 04:19:25 +0000 Subject: ** Fixes bug #373116 2007-04-01 Matthew Barnes ** 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 --- plugins/groupwise-account-setup/ChangeLog | 7 +++++++ plugins/groupwise-account-setup/camel-gw-listener.c | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'plugins/groupwise-account-setup') diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog index 19dd5f3054..a0a75f3106 100644 --- a/plugins/groupwise-account-setup/ChangeLog +++ b/plugins/groupwise-account-setup/ChangeLog @@ -1,3 +1,10 @@ +2007-04-01 Matthew Barnes + + ** Fixes part of bug #373116 + + * camel-gw-listener.c (add_esource): + Use the new ESource color API. + 2007-02-09 Sankar P * camel-gw-listener.c: (add_esource), (remove_esource), diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index 39328418a8..58c46b7bfe 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -212,12 +212,10 @@ add_esource (const char *conf_key, const char *group_name, const char *source_n e_source_set_property (source, "use_ssl", use_ssl); e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" ); if (parent_id_name) { - guint32 color; e_source_set_property (source, "parent_id_name", parent_id_name); - color = (guint32) atoi((char *)(camel_url_get_param (url, "color"))); - e_source_set_color (source, color); + e_source_set_color_spec (source, camel_url_get_param (url, "color")); } else - e_source_set_color (source, 0xEEBC60); + e_source_set_color_spec (source, "#EEBC60"); e_source_group_add_source (group, source, -1); e_source_list_sync (source_list, NULL); -- cgit v1.2.3