aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorSivaiah Nallagatla <snallagatla@novell.com>2005-03-05 01:30:24 +0800
committerSivaiah Nallagatla <siva@src.gnome.org>2005-03-05 01:30:24 +0800
commit9ff3b664bf5fa76c653488ae3065ebb10c6de0f2 (patch)
treeefa5878eb639fb74499b8ed44d23a2dddabb88f8 /plugins
parenta45b33e0dbc03ee82cf15513a7e014cc79b596c8 (diff)
downloadgsoc2013-evolution-9ff3b664bf5fa76c653488ae3065ebb10c6de0f2.tar
gsoc2013-evolution-9ff3b664bf5fa76c653488ae3065ebb10c6de0f2.tar.gz
gsoc2013-evolution-9ff3b664bf5fa76c653488ae3065ebb10c6de0f2.tar.bz2
gsoc2013-evolution-9ff3b664bf5fa76c653488ae3065ebb10c6de0f2.tar.lz
gsoc2013-evolution-9ff3b664bf5fa76c653488ae3065ebb10c6de0f2.tar.xz
gsoc2013-evolution-9ff3b664bf5fa76c653488ae3065ebb10c6de0f2.tar.zst
gsoc2013-evolution-9ff3b664bf5fa76c653488ae3065ebb10c6de0f2.zip
don't set the relative uri if already present. Also change the typo in the
2005-02-28 Sivaiah Nallagatla <snallagatla@novell.com> * addressbook-file.c (e_book_file_dummy) : don't set the relative uri if already present. Also change the typo in the prototype s/calendar/book part of fix for #73152 svn path=/trunk/; revision=28959
Diffstat (limited to 'plugins')
-rw-r--r--plugins/addressbook-file/ChangeLog7
-rw-r--r--plugins/addressbook-file/addressbook-file.c14
2 files changed, 18 insertions, 3 deletions
diff --git a/plugins/addressbook-file/ChangeLog b/plugins/addressbook-file/ChangeLog
index be7f3e686d..14803024d7 100644
--- a/plugins/addressbook-file/ChangeLog
+++ b/plugins/addressbook-file/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-28 Sivaiah Nallagatla <snallagatla@novell.com>
+
+ * addressbook-file.c (e_book_file_dummy) :
+ don't set the relative uri if already present.
+ Also change the typo in the prototype s/calendar/book
+ part of fix for #73152
+
2005-02-24 Björn Torkelsson <torkel@acc.umu.se>
* org-gnome-addressbook-file.eplug.in: Added author and description.
diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c
index 04b1e59b68..eaebcf28a0 100644
--- a/plugins/addressbook-file/addressbook-file.c
+++ b/plugins/addressbook-file/addressbook-file.c
@@ -33,7 +33,7 @@
#include <libgnome/gnome-i18n.h>
#include <string.h>
-GtkWidget *e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
+GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
GtkWidget *
e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
@@ -41,14 +41,22 @@ e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
EABConfigTargetSource *t = (EABConfigTargetSource *) 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);
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);