[evolution-patches] patch for #73512 (calendar file and adress book file plugins)

[Sivaiah Nallagatla <snallagatla novell com>]

Both calendar-file and addressbook-file are cahnging the uri's of the
system calendar and books to sources uid from "system" when their
proprties are edited. So ensure_sources creates them again as it did not
system calendat and book.

Siva

Index: plugins/calendar-file/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/calendar-file/ChangeLog,v
retrieving revision 1.2
diff -u -p -r1.2 ChangeLog
--- plugins/calendar-file/ChangeLog	25 Feb 2005 15:54:18 -0000	1.2
+++ plugins/calendar-file/ChangeLog	1 Mar 2005 19:35:44 -0000
@@ -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.
Index: plugins/calendar-file/calendar-file.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/calendar-file/calendar-file.c,v
retrieving revision 1.1
diff -u -p -r1.1 calendar-file.c
--- plugins/calendar-file/calendar-file.c	9 Jan 2005 17:50:11 -0000	1.1
+++ plugins/calendar-file/calendar-file.c	1 Mar 2005 19:35:44 -0000
@@ -42,10 +42,18 @@ e_calendar_file_dummy (EPlugin *epl, ECo
 	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);
+		
+		return NULL;
+	}
+
+	relative_uri = e_source_peek_relative_uri (source);
+	if (relative_uri && *relative_uri) {
+	  	g_free (uri_text);
 		
 		return NULL;
 	}
Index: plugins/addressbook-file/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/addressbook-file/ChangeLog,v
retrieving revision 1.2
diff -u -p -r1.2 ChangeLog
--- plugins/addressbook-file/ChangeLog	25 Feb 2005 15:54:17 -0000	1.2
+++ plugins/addressbook-file/ChangeLog	1 Mar 2005 19:35:44 -0000
@@ -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.
Index: plugins/addressbook-file/addressbook-file.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/addressbook-file/addressbook-file.c,v
retrieving revision 1.1
diff -u -p -r1.1 addressbook-file.c
--- plugins/addressbook-file/addressbook-file.c	21 Jan 2005 15:29:02 -0000	1.1
+++ plugins/addressbook-file/addressbook-file.c	1 Mar 2005 19:35:44 -0000
@@ -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, EConfig
 	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);