[evolution-patches] patch for addressbook 43213



the config upgrade stuff populates the entire set of config settings (at
least those of type "string") with empty strings.  so we need to check
for that here.

Chris
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1417
diff -u -r1.1417 ChangeLog
--- ChangeLog	16 May 2003 20:10:00 -0000	1.1417
+++ ChangeLog	19 May 2003 11:54:26 -0000
@@ -1,3 +1,10 @@
+2003-05-19  Chris Toshok  <toshok ximian com>
+
+	* gui/component/addressbook-component.c
+	(ensure_completion_uris_exist): fix the initial run case.  the
+	config upgrade code creates all elements so we can't just check
+	for NULL - we have to check if the string is empty.  Fixes #43213.
+
 2003-05-16  Anna Marie Dirks  <anna ximian com>
 
 	* gui/contact-list-editor/contact-list-editor.glade:  Added 
Index: gui/component/addressbook-component.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-component.c,v
retrieving revision 1.87
diff -u -r1.87 addressbook-component.c
--- gui/component/addressbook-component.c	14 May 2003 18:44:27 -0000	1.87
+++ gui/component/addressbook-component.c	19 May 2003 11:54:26 -0000
@@ -593,6 +593,11 @@
 		
 	val = e_config_listener_get_string (db, "/apps/evolution/addressbook/completion/uris");
 
+	if (val && !*val) {
+		g_free (val);
+		val = NULL;
+	}
+		
 	if (!val) {
 		EFolderListItem f[2];
 		char *dirname, *uri;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]