diff options
| author | Jeffrey Stedfast <fejj@novell.com> | 2004-06-04 04:24:28 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-06-04 04:24:28 +0800 |
| commit | 6a603b5cf40882d2c558a7a29c394032694d2315 (patch) | |
| tree | b334ae609947ac00b00318201db9ef8027018b40 | |
| parent | 7c0d72183dbe654feaaf146435816b4aaf58eebf (diff) | |
| download | gsoc2013-evolution-6a603b5cf40882d2c558a7a29c394032694d2315.tar gsoc2013-evolution-6a603b5cf40882d2c558a7a29c394032694d2315.tar.gz gsoc2013-evolution-6a603b5cf40882d2c558a7a29c394032694d2315.tar.bz2 gsoc2013-evolution-6a603b5cf40882d2c558a7a29c394032694d2315.tar.lz gsoc2013-evolution-6a603b5cf40882d2c558a7a29c394032694d2315.tar.xz gsoc2013-evolution-6a603b5cf40882d2c558a7a29c394032694d2315.tar.zst gsoc2013-evolution-6a603b5cf40882d2c558a7a29c394032694d2315.zip | |
If the last_uri string value is the Evolution 1.4 URI, change it to the
2004-06-03 Jeffrey Stedfast <fejj@novell.com>
* conduits/calendar/calendar-conduit.c
(calconduit_load_configuration): If the last_uri string value is
the Evolution 1.4 URI, change it to the new URI. Fixes bug #54134.
svn path=/trunk/; revision=26203
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.c | 21 |
2 files changed, 25 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index cf2cc952df..7246943e2a 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2004-06-03 Jeffrey Stedfast <fejj@novell.com> + + * conduits/calendar/calendar-conduit.c + (calconduit_load_configuration): If the last_uri string value is + the Evolution 1.4 URI, change it to the new URI. Fixes bug #54134. + 2004-06-03 Rodrigo Moya <rodrigo@novell.com> Fixes #59481 diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index e471d83944..f733cd8c50 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -132,8 +132,25 @@ calconduit_load_configuration (guint32 pilot_id) c->secret = gnome_config_get_bool ("secret=FALSE"); c->multi_day_split = gnome_config_get_bool ("multi_day_split=TRUE"); - c->last_uri = gnome_config_get_string ("last_uri"); - + if ((c->last_uri = gnome_config_get_string ("last_uri")) && !strncmp (c->last_uri, "file://", 7)) { + const char *path = c->last_uri + 7; + const char *home; + + home = g_get_home_dir (); + + if (!strncmp (path, home, strlen (home))) { + path += strlen (home); + if (*path == '/') + path++; + + if (!strcmp (path, "evolution/local/Calendar/calendar.ics")) { + /* need to upgrade the last_uri. yay. */ + g_free (c->last_uri); + c->last_uri = g_strdup_printf ("file://%s/.evolution/calendar/local/system/calendar.ics", home); + } + } + } + gnome_config_pop_prefix (); return c; |