call calendar_config_write_on_exit() to write out some special config

2000-10-11  Damon Chaplin  <damon@helixcode.com>

	* gui/main.c (main): call calendar_config_write_on_exit() to write
	out some special config settings (as the mail component does).

	* gui/calendar-commands.c (properties_cmd): changed to use the new
	preferences dialog.
	(update_all_config_settings): new function to iterate over all the
	calendars and update the config settings.

	* gui/dialogs/cal-prefs-dialog.glade: preferences dialog.

	* gui/dialogs/cal-prefs-dialog.[hc]: new files for the preferences
	dialog.

	* gui/calendar-config.[hc]: new files to handle loading/saving config
	settings.

	* cal-util/cal-recur.c: fixed bug in YEARLY when no filters were set,
	plus minor changes.

	* cal-util/test-recur.c: updated.

	* gui/e-day-view-time-item.c:
	* gui/popup-menu.c: update to #include <gal/widgets/e-gui-utils.h>

	* gui/component-factory.c (owner_set_cb): called calendar_config_init.
	(owner_set_cb):
	(owner_unset_cb): updated the prototypes.

	* gui/main.c (main): added call to calendar_config_write_on_exit().

	* gui/component-factory.h:
	* gui/component-factory.c (owner_set_cb): added global evolution_dir
	just like the mail component, so we know we to store config stuff.

svn path=/trunk/; revision=5856

1 files changed, 16 insertions, 5 deletions

diff --git a/calendar/cal-util/test-recur.c b/calendar/cal-util/test-recur.c
index 01a1719903..620e65c185 100644
--- a/calendar/cal-util/test-recur.c
+++ b/calendar/cal-util/test-recur.c
@@ -33,8 +33,12 @@
 #include <cal-util/cal-recur.h>
 
 
+/* Since events can recur infinitely, we set a limit to the number of
+   occurrences we output. */
+#define MAX_OCCURRENCES	1000
+
 static void usage			(void);
-static icalcomponent* scan_vcs_file	(char		*filename);
+static icalcomponent* scan_ics_file	(char		*filename);
 static char* get_line			(char		*s,
 					 size_t		 size,
 					 void		*data);
@@ -59,7 +63,7 @@ main			(int		 argc,
 
 	filename = argv[1];
 
-	icalcomp = scan_vcs_file (filename);
+	icalcomp = scan_ics_file (filename);
 	if (icalcomp)
 		generate_occurrences	(icalcomp);
 
@@ -76,7 +80,7 @@ usage			(void)
 
 
 static icalcomponent*
-scan_vcs_file		(char		*filename)
+scan_ics_file		(char		*filename)
 {
 	FILE *fp;
 	icalcomponent *icalcomp;
@@ -115,6 +119,7 @@ generate_occurrences	(icalcomponent	*icalcomp)
 {
 	icalcomponent *tmp_icalcomp;
 	CalComponent *comp;
+	gint occurrences;
 
 	for (tmp_icalcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
 	     tmp_icalcomp;
@@ -137,7 +142,9 @@ generate_occurrences	(icalcomponent	*icalcomp)
 		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));
 
 		cal_recur_generate_instances (comp, -1, -1,
-					      occurrence_cb, NULL);
+					      occurrence_cb, &occurrences);
+
+		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));
 	}
 }
 
@@ -149,6 +156,9 @@ occurrence_cb		(CalComponent	*comp,
 			 gpointer	 data)
 {
 	char start[32], finish[32];
+	gint *occurrences;
+
+	occurrences = (gint*) data;
 
 	strcpy (start, ctime (&instance_start));
 	start[24] = '\0';
@@ -157,5 +167,6 @@ occurrence_cb		(CalComponent	*comp,
 
 	g_print ("%s - %s\n", start, finish);
 
-	return TRUE;
+	(*occurrences)++;
+	return (*occurrences == MAX_OCCURRENCES) ? FALSE : TRUE;
 }