diff options
| author | Chenthill Palanisamy <pchenthill@novell.com> | 2005-05-24 20:36:05 +0800 |
|---|---|---|
| committer | Chenthill Palanisamy <pchen@src.gnome.org> | 2005-05-24 20:36:05 +0800 |
| commit | 71529100f8d8f5b9e648fd4ec29f18a3a5e5400a (patch) | |
| tree | f8b657b311f382180307a8e119f10bb67524589f /calendar | |
| parent | c33282a6549d7f7d64a27a9d14e6e99b114053b9 (diff) | |
| download | gsoc2013-evolution-71529100f8d8f5b9e648fd4ec29f18a3a5e5400a.tar.gz gsoc2013-evolution-71529100f8d8f5b9e648fd4ec29f18a3a5e5400a.tar.zst gsoc2013-evolution-71529100f8d8f5b9e648fd4ec29f18a3a5e5400a.zip | |
Fixes #272114 Check if the color is present in the source before setting
2005-05-24 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #272114
* gui/dialogs/calendar-setup.c: (eccp_commit),
(calendar_setup_edit_calendar): Check if the color is
present in the source before setting it.
svn path=/trunk/; revision=29407
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/dialogs/calendar-setup.c | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 7d277d1e45..20e3407aae 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2005-05-24 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #272114 + * gui/dialogs/calendar-setup.c: (eccp_commit), + (calendar_setup_edit_calendar): Check if the color is + present in the source before setting it. + 2005-05-24 Srinivasa Ragavan <sragavan@novell.com> * gui/dialogs/cal-attachment-bar.c, gui/dialogs/cal-attachment-bar.h, gui/dialogs/cal-attachment.c, gui/dialogs/cal-attachment.h, diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index 53c46a0752..0cfc32a217 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -109,8 +109,8 @@ eccp_commit (EConfig *ec, GSList *items, void *data) e_source_update_from_xml_node (sdialog->original_source, xml->children, NULL); xmlFreeNode (xml); - e_source_get_color (sdialog->source, &color); - e_source_set_color (sdialog->original_source, color); + if (e_source_get_color (sdialog->source, &color)) + e_source_set_color (sdialog->original_source, color); } else { e_source_group_add_source (sdialog->source_group, sdialog->source, -1); e_source_list_sync (sdialog->source_list, NULL); @@ -412,8 +412,8 @@ calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourc sdialog->source = e_source_new_from_standalone_xml (xml); g_free (xml); - e_source_get_color (source, &color); - e_source_set_color (sdialog->source, color); + if (e_source_get_color (source, &color)) + e_source_set_color (sdialog->source, color); } else { GConfClient *gconf; GSList *l; |