From 137e86ce01a8059d1f75d3014a033a56b877a016 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Wed, 19 Dec 2001 15:35:58 +0000 Subject: use cal_client_open_default_tasks 2001-12-19 JP Rosevear * e-summary-tasks.c (e_summary_tasks_init): use cal_client_open_default_tasks * e-summary-calendar.c (e_summary_calendar_init): use cal_client_open_default_calendar svn path=/trunk/; revision=15181 --- my-evolution/ChangeLog | 8 ++++++++ my-evolution/e-summary-calendar.c | 11 +---------- my-evolution/e-summary-tasks.c | 24 +----------------------- 3 files changed, 10 insertions(+), 33 deletions(-) (limited to 'my-evolution') diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 2fccd50181..d6f6f5941c 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,11 @@ +2001-12-19 JP Rosevear + + * e-summary-tasks.c (e_summary_tasks_init): use + cal_client_open_default_tasks + + * e-summary-calendar.c (e_summary_calendar_init): use + cal_client_open_default_calendar + 2001-12-14 Iain Holmes * Location-translation-script: shell script to convert Locations to diff --git a/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c index 46afa0cf45..b76ceeb8c0 100644 --- a/my-evolution/e-summary-calendar.c +++ b/my-evolution/e-summary-calendar.c @@ -484,8 +484,6 @@ e_summary_calendar_init (ESummary *summary) CORBA_Environment ev; ESummaryCalendar *calendar; gboolean result; - char *uri; - char *default_uri; g_return_if_fail (summary != NULL); @@ -517,14 +515,7 @@ e_summary_calendar_init (ESummary *summary) gtk_signal_connect (GTK_OBJECT (calendar->client), "obj-removed", GTK_SIGNAL_FUNC (obj_changed_cb), summary); - default_uri = bonobo_config_get_string (db, "/Calendar/DefaultUri", NULL); - if (!default_uri) - uri = gnome_util_prepend_user_home ("evolution/local/Calendar/calendar.ics"); - else - uri = g_strdup (default_uri); - - result = cal_client_open_calendar (calendar->client, uri, FALSE); - g_free (uri); + result = cal_client_open_default_calendar (calendar->client, FALSE); if (result == FALSE) { g_message ("Open calendar failed"); } diff --git a/my-evolution/e-summary-tasks.c b/my-evolution/e-summary-tasks.c index 4700e507da..a8c32b1db7 100644 --- a/my-evolution/e-summary-tasks.c +++ b/my-evolution/e-summary-tasks.c @@ -375,10 +375,6 @@ e_summary_tasks_init (ESummary *summary) { ESummaryTasks *tasks; gboolean result; - char *uri; - char *default_uri; - Bonobo_ConfigDatabase db; - CORBA_Environment ev; g_return_if_fail (summary != NULL); @@ -386,18 +382,8 @@ e_summary_tasks_init (ESummary *summary) summary->tasks = tasks; tasks->html = NULL; - CORBA_exception_init (&ev); - db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev); - if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) { - CORBA_exception_free (&ev); - g_warning ("Error getting Wombat. Using defaults"); - } - - CORBA_exception_free (&ev); - tasks->client = cal_client_new (); if (tasks->client == NULL) { - bonobo_object_release_unref (db, NULL); g_warning ("Error making the client"); return; } @@ -409,20 +395,12 @@ e_summary_tasks_init (ESummary *summary) gtk_signal_connect (GTK_OBJECT (tasks->client), "obj-removed", GTK_SIGNAL_FUNC (obj_changed_cb), summary); - default_uri = bonobo_config_get_string (db, "/Calendar/DefaultTasksUri", NULL); - if (!default_uri) - uri = gnome_util_prepend_user_home ("evolution/local/Tasks/tasks.ics"); - else - uri = g_strdup (default_uri); - - result = cal_client_open_calendar (tasks->client, uri, FALSE); - g_free (uri); + result = cal_client_open_default_tasks (tasks->client, FALSE); if (result == FALSE) { g_message ("Open tasks failed"); } e_summary_add_protocol_listener (summary, "tasks", e_summary_tasks_protocol, tasks); - bonobo_object_release_unref (db, NULL); } void -- cgit v1.2.3