aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-04-11 06:00:46 +0800
committerDan Winship <danw@src.gnome.org>2002-04-11 06:00:46 +0800
commitf0e916f543ac1160b812b37629dda25c1a021e2b (patch)
tree997c4d30439ae57d8246330c9def4cfefaa8189c
parent44a748f48a19e139e3eafa414e28ca0a1ea8199c (diff)
downloadgsoc2013-evolution-f0e916f543ac1160b812b37629dda25c1a021e2b.tar
gsoc2013-evolution-f0e916f543ac1160b812b37629dda25c1a021e2b.tar.gz
gsoc2013-evolution-f0e916f543ac1160b812b37629dda25c1a021e2b.tar.bz2
gsoc2013-evolution-f0e916f543ac1160b812b37629dda25c1a021e2b.tar.lz
gsoc2013-evolution-f0e916f543ac1160b812b37629dda25c1a021e2b.tar.xz
gsoc2013-evolution-f0e916f543ac1160b812b37629dda25c1a021e2b.tar.zst
gsoc2013-evolution-f0e916f543ac1160b812b37629dda25c1a021e2b.zip
Fix this: Rodrigo's patch used one of the functions I just removed. :)
* gui/gnome-cal.c (gnome_calendar_open): Fix this: Rodrigo's patch used one of the functions I just removed. :) svn path=/trunk/; revision=16433
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/gnome-cal.c18
2 files changed, 11 insertions, 12 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f62b5ffbcd..a8b39328d9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-10 Dan Winship <danw@ximian.com>
+
+ * gui/gnome-cal.c (gnome_calendar_open): Fix this: Rodrigo's patch
+ used one of the functions I just removed. :)
+
2002-04-10 Rodrigo Moya <rodrigo@ximian.com>
* gui/gnome-cal.c (gnome_calendar_open): use the default uri for
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 97cbc9292a..809e3588e3 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1895,31 +1895,25 @@ gnome_calendar_open (GnomeCalendar *gcal, const char *str_uri)
if (!uri) {
tasks_uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);
success = cal_client_open_calendar (priv->task_pad_client, tasks_uri, FALSE);
-
- add_alarms (tasks_uri);
g_free (tasks_uri);
}
else {
if (!g_strncasecmp (uri->protocol, "file", 4)) {
tasks_uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);
+ success = cal_client_open_calendar (priv->task_pad_client, tasks_uri, FALSE);
+ g_free (tasks_uri);
}
else {
- /* we use the default uri for tasks */
- tasks_uri = calendar_config_get_default_tasks_uri ();
- if (!tasks_uri)
- tasks_uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);
+ success = cal_client_open_default_tasks (priv->task_pad_client, FALSE);
}
-
- success = cal_client_open_calendar (priv->task_pad_client, tasks_uri, FALSE);
- add_alarms (tasks_uri);
- g_free (tasks_uri);
-
}
g_free (real_uri);
e_uri_free (uri);
- if (!success) {
+ if (success)
+ add_alarms (cal_client_get_uri (priv->task_pad_client));
+ else {
g_message ("gnome_calendar_open(): Could not issue the request");
return FALSE;
}