diff options
| author | Dan Winship <danw@src.gnome.org> | 2002-04-11 00:58:14 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2002-04-11 00:58:14 +0800 |
| commit | 6ee39cc8619bf63082159433397875df30180fb1 (patch) | |
| tree | 4b083f4d0cf306a95bfcc82916df9c341a595932 /calendar/gui/component-factory.c | |
| parent | c5ac2a9e510fa9e53683e4f270c82e0296da8043 (diff) | |
| download | gsoc2013-evolution-6ee39cc8619bf63082159433397875df30180fb1.tar gsoc2013-evolution-6ee39cc8619bf63082159433397875df30180fb1.tar.gz gsoc2013-evolution-6ee39cc8619bf63082159433397875df30180fb1.tar.bz2 gsoc2013-evolution-6ee39cc8619bf63082159433397875df30180fb1.tar.lz gsoc2013-evolution-6ee39cc8619bf63082159433397875df30180fb1.tar.xz gsoc2013-evolution-6ee39cc8619bf63082159433397875df30180fb1.tar.zst gsoc2013-evolution-6ee39cc8619bf63082159433397875df30180fb1.zip | |
Use new-and-improved default folder URI config paths.
* cal-client/cal-client.c (get_default_uri): Use new-and-improved
default folder URI config paths.
* gui/calendar-config.c (calendar_config_{get,set}_default_uri,
calendar_config_{get,set}_default_tasks_uri): Remove these. The
shell owns this information now. (Weren't being used anyway.)
* gui/component-factory.c (get_data_uri): Fix another place that
hardcoded tacking foo.ics on to the end of URLs.
svn path=/trunk/; revision=16421
Diffstat (limited to 'calendar/gui/component-factory.c')
| -rw-r--r-- | calendar/gui/component-factory.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c index a9cc8a89f9..b4a2b3ab89 100644 --- a/calendar/gui/component-factory.c +++ b/calendar/gui/component-factory.c @@ -506,6 +506,8 @@ static char * get_data_uri (const char *uri, CalComponentVType vtype) { if (uri) { + if (*uri != '/' && strncmp (uri, "file:", 5) != 0) + return g_strdup (uri); if (vtype == CAL_COMPONENT_EVENT) return g_concat_dir_and_file (uri, "calendar.ics"); else if (vtype == CAL_COMPONENT_TODO) |