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

Fixes #272114 Check if the color is present in the source before setting

Browse Source 
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
This commit is contained in:
Chenthill Palanisamy
2005-05-24 12:36:05 +00:00
committed by Chenthill Palanisamy
parent c33282a654
commit 71529100f8
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/ChangeLog
View File

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

8
calendar/gui/dialogs/calendar-setup.c
View File

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