aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/calendar-file
diff options
context:
space:
mode:
authorSivaiah Nallagatla <snallagatla@novell.com>2005-03-05 01:31:58 +0800
committerSivaiah Nallagatla <siva@src.gnome.org>2005-03-05 01:31:58 +0800
commit28f19ab61e40958dc036d153c10eaa025f632401 (patch)
tree422644e3d4bd316929165adaf34d4f46e4361a37 /plugins/calendar-file
parent9ff3b664bf5fa76c653488ae3065ebb10c6de0f2 (diff)
downloadgsoc2013-evolution-28f19ab61e40958dc036d153c10eaa025f632401.tar.gz
gsoc2013-evolution-28f19ab61e40958dc036d153c10eaa025f632401.tar.zst
gsoc2013-evolution-28f19ab61e40958dc036d153c10eaa025f632401.zip
don't set the relative uri if already present.
2005-02-28 Sivaiah Nallagatla <snallagatla@novell.com> * calendar-file.c (e_calendar_file_dummy) : don't set the relative uri if already present. part of fix for #73152 svn path=/trunk/; revision=28960
Diffstat (limited to 'plugins/calendar-file')
-rw-r--r--plugins/calendar-file/ChangeLog7
-rw-r--r--plugins/calendar-file/calendar-file.c10
2 files changed, 16 insertions, 1 deletions
diff --git a/plugins/calendar-file/ChangeLog b/plugins/calendar-file/ChangeLog
index 009852e700..891ae98555 100644
--- a/plugins/calendar-file/ChangeLog
+++ b/plugins/calendar-file/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-28 Sivaiah Nallagatla <snallagatla@novell.com>
+
+ * calendar-file.c (e_calendar_file_dummy) :
+ don't set the relative uri if already present.
+
+ part of fix for #73152
+
2005-02-24 Björn Torkelsson <torkel@acc.umu.se>
* calendar-file.c: Added author and description.
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index f47ce2c8ac..193b486812 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -42,7 +42,8 @@ e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
ESource *source = t->source;
char *uri_text;
-
+ char *relative_uri;
+
uri_text = e_source_get_uri (source);
if (strncmp (uri_text, "file", 4)) {
g_free (uri_text);
@@ -50,6 +51,13 @@ e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
return NULL;
}
+ relative_uri = e_source_peek_relative_uri (source);
+ if (relative_uri && *relative_uri) {
+ g_free (uri_text);
+
+ return NULL;
+ }
+
e_source_set_relative_uri (source, e_source_peek_uid (source));
uri_text = e_source_get_uri (source);