[evolution-patches] patch for #73330 (address book)

[Sivaiah Nallagatla <snallagatla novell com>]

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/ChangeLog,v
retrieving revision 1.36
diff -u -p -r1.36 ChangeLog
--- ChangeLog	23 Mar 2005 11:16:08 -0000	1.36
+++ ChangeLog	4 Apr 2005 05:58:09 -0000
@@ -1,3 +1,36 @@
+2005-04-04  Sivaiah Nallagatla <snallagatla novell com>
+
+       * e-book-auth-util.c (load_source_auth_cb)
+        (addressbook_authenticate) : get the uri from Ebook
+       instead of Esource. e_source_get_uri returns NULL when
+       it does not have a reference to source group with it
+       which happens when the source list from which this source
+       was taken is destroyed but Ebook has reference to that source.
+       e_book_get_uri returns the same uri and it will be always present
+       Fixes #73330
+
+2005-03-31  Hans Petter Jansson  <hpj novell com>
+
+	* e-name-selector.c (source_books_destroy): Implement.
+	(e_name_selector_init): Create a list of completion books, and open
+	them with interactive authentication.
+	(e_name_selector_peek_section_entry): Re-use the list of opened books
+	for each entry.
+
+	* e-name-selector-entry.c (e_name_selector_entry_realize): If the user
+	didn't set a contact store, create the default one here.
+	(e_name_selector_entry_class_init): Set up our realize method.
+	(e_name_selector_entry_init): Don't set up the default contact store
+	here.
+	(setup_default_contact_store): Also create the contact store itself.
+	(set_completion_query)
+	(find_existing_completion)
+	(completion_match_selected)
+	(contact_layout_formatter)
+	(popup_activate_contact)
+	(setup_contact_store)
+	(e_name_selector_entry_set_contact_store): Tolerate NULL contact store.
+
 2005-03-23  Rodrigo Moya <rodrigo novell com>
 
 	Fixes #73472
Index: e-book-auth-util.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-book-auth-util.c,v
retrieving revision 1.1
diff -u -p -r1.1 e-book-auth-util.c
--- e-book-auth-util.c	23 Feb 2005 18:52:12 -0000	1.1
+++ e-book-auth-util.c	4 Apr 2005 05:58:09 -0000
@@ -53,7 +53,7 @@ free_load_source_data (LoadSourceData *d
 }
 
 static gchar *
-remove_parameters_from_uri (gchar *uri)
+remove_parameters_from_uri (const gchar *uri)
 {
   gchar **components;
   gchar *new_uri = NULL;
@@ -102,7 +102,7 @@ load_source_auth_cb (EBook *book, EBookS
 			free_load_source_data (data);
 			return;
 		} else {
-			gchar *uri = e_source_get_uri (data->source);
+			const gchar *uri = e_book_get_uri (book);
 			gchar *stripped_uri = remove_parameters_from_uri (uri);
 			const gchar *auth_domain = e_source_get_property (data->source, "auth-domain");
 			const gchar *component_name;
@@ -113,7 +113,7 @@ load_source_auth_cb (EBook *book, EBookS
 			addressbook_authenticate (book, TRUE, data->source, load_source_auth_cb, closure);
 
 			g_free (stripped_uri);
-			g_free (uri);
+		       
 			return;
 		}
 	}
@@ -152,12 +152,11 @@ addressbook_authenticate (EBook *book, g
 	const gchar *component_name;
 	const char *password     = NULL;
 	char *pass_dup           = NULL;
-	gchar *uri               = e_source_get_uri (source);
+	const gchar *uri               = e_book_get_uri (book);
         gchar *stripped_uri      = remove_parameters_from_uri (uri);
 	const gchar *auth_domain = e_source_get_property (source, "auth-domain");
 			
 	component_name = auth_domain ? auth_domain : "Addressbook";
-	g_free (uri);
 	uri = stripped_uri;
 
 	password = e_passwords_get_password (component_name, uri);

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1929
diff -u -p -r1.1929 ChangeLog
--- ChangeLog	24 Mar 2005 08:30:24 -0000	1.1929
+++ ChangeLog	4 Apr 2005 05:52:39 -0000
@@ -1,3 +1,14 @@
+2005-04-04  Sivaiah Nallagatla <snallagatla novell com>
+
+	* gui/component/addressbook.c (load_source_auth_cb)
+        (addressbook_authenticate) : get the uri from Ebook 
+	instead of Esource. e_source_get_uri returns NULL when 
+	it does not have a reference to source group with it
+	which happens when the source list from which this source 
+	was taken is destroyed but Ebook has reference to that source. 
+	e_book_get_uri returns the same uri and it will be always present
+	Fixes #73330 
+		
 2005-03-16  Li Yuan  <li yuan sun com>
 
 	* gui/widgets/gal-view-minicard.c: (gal_view_minicard_class_init):
Index: gui/component/addressbook.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook.c,v
retrieving revision 1.249
diff -u -p -r1.249 addressbook.c
--- gui/component/addressbook.c	5 Mar 2005 08:40:50 -0000	1.249
+++ gui/component/addressbook.c	4 Apr 2005 05:52:39 -0000
@@ -56,7 +56,7 @@ free_load_source_data (LoadSourceData *d
 in uri*/
 
 static gchar*
-remove_parameters_from_uri (gchar *uri)
+remove_parameters_from_uri (const gchar *uri)
 {
   gchar **components;
   gchar *new_uri = NULL;
@@ -112,7 +112,7 @@ load_source_auth_cb (EBook *book, EBookS
 			return;
 
 		} else {
-			gchar *uri = e_source_get_uri (data->source);
+			const gchar *uri = e_book_get_uri (data->source);
 			gchar *stripped_uri = remove_parameters_from_uri (uri);
 			const gchar *auth_domain = e_source_get_property (data->source, "auth-domain");
 			const gchar *component_name;
@@ -123,7 +123,6 @@ load_source_auth_cb (EBook *book, EBookS
 			addressbook_authenticate (book, TRUE, data->source, load_source_auth_cb, closure);
 
 			g_free (stripped_uri);
-			g_free (uri);
 			return;
 		}
 	}
@@ -161,13 +160,12 @@ addressbook_authenticate (EBook *book, g
 	char *pass_dup = NULL;
 	const gchar *auth;
 	const gchar *user;
-	gchar *uri = e_source_get_uri (source);
+	const gchar *uri = e_book_get_uri (book);
         gchar *stripped_uri = remove_parameters_from_uri (uri);
 	const gchar *auth_domain = e_source_get_property (source, "auth-domain");
 	const gchar *component_name;
 			
 	component_name = auth_domain ? auth_domain : "Addressbook";
-	g_free (uri);
 	uri = stripped_uri;
 
 	password = e_passwords_get_password (component_name, uri);