just set up the alarm notify object

2004-05-18  JP Rosevear  <jpr@novell.com>

	* gui/alarm-notify/notify-main.c (init_alarm_service): just set
up
	the alarm notify object

	* gui/alarm-notify/alarm-notify.h: update proto

	* gui/alarm-notify/alarm-notify.c (process_removal_in_hash):
	process removals using the source list
	(list_changed_cb): when the list changes, update
	(load_calendars): initially load the calendars
	(alarm_notify_init): load the calendars here and don't listen
for
	a selection notification
	(alarm_notify_add_calendar): get the source type when adding a
	calendar

	* gui/alarm-notify/notify-main.c (main): no need to
init/shutdown
	gnome vfs

	* gui/alarm-notify/config-data.h: new proto

	* gui/alarm-notify/config-data.c
	(config_data_get_notify_with_tray): routine to get schema value

	* gui/alarm-notify/alarm.c (alarm_ready_cb): no timeout checking
	here, setup_timeout does that
	(queue_alarm): ditto
	(setup_timeout): calculate the timeout better

	* gui/alarm-notify/alarm-queue.c (query_objects_changed_cb):
tidy
	(edit_component): clean up exception handling
	(display_notification): don't show the tray icon if we aren't
	notifying with the tray

	* gui/apps_evolution_calendar.schemas.in.in: add
notify_with_tray
	option

svn path=/trunk/; revision=25958

1 files changed, 5 insertions, 40 deletions

diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index bbc508577b..cd3f7ed885 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -138,49 +138,14 @@ config_data_get_24_hour_format (void)
 	return TRUE;
 }
 
-GPtrArray *
-config_data_get_calendars_to_load (void)
+gboolean
+config_data_get_notify_with_tray (void)
 {
-	GPtrArray *cals;
-	GSList *uids_selected, *l;
-	ESource *source;
-
 	ensure_inited ();
 
-	/* create the array to be returned */
-	cals = g_ptr_array_new ();
-
-	/* get selected calendars */
-	uids_selected = gconf_client_get_list (conf_client, "/apps/evolution/calendar/display/selected_calendars",
-					       GCONF_VALUE_STRING, NULL);
-	for (l = uids_selected; l != NULL; l = l->next) {
-		char *uid = l->data;
-
-		source = e_source_list_peek_source_by_uid (calendar_source_list, uid);
-		if (source)
-			g_ptr_array_add (cals, source);
-
-		g_free (uid);
-	}
-
-	g_slist_free (uids_selected);
-
-	/* get selected tasks */
-	uids_selected = gconf_client_get_list (conf_client, "/apps/evolution/calendar/tasks/selected_tasks",
-					       GCONF_VALUE_STRING, NULL);
-	for (l = uids_selected; l != NULL; l = l->next) {
-		char *uid = l->data;
-
-		source = e_source_list_peek_source_by_uid (calendar_source_list, uid);
-		if (source)
-			g_ptr_array_add (cals, source);
-
-		g_free (uid);
-	}
-
-	g_slist_free (uids_selected);
-
-	return cals;
+	return gconf_client_get_bool (conf_client,
+				      "/apps/evolution/calendar/notify/notify_with_tray",
+				      NULL);
 }
 
 /**