aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2003-05-20 02:49:07 +0800
committerChris Toshok <toshok@src.gnome.org>2003-05-20 02:49:07 +0800
commit15e8b4e4779bc512a6949927be1c9d4765a1e302 (patch)
treeb941d9f0683522e4981f360b4f2d0319fe6e6eb2
parent2d3e30b912bf3c5a9473bd1b53de75752b9ec89c (diff)
downloadgsoc2013-evolution-15e8b4e4779bc512a6949927be1c9d4765a1e302.tar.gz
gsoc2013-evolution-15e8b4e4779bc512a6949927be1c9d4765a1e302.tar.zst
gsoc2013-evolution-15e8b4e4779bc512a6949927be1c9d4765a1e302.zip
fix the initial run case. the config upgrade code creates all elements so
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. svn path=/trunk/; revision=21263
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook-component.c5
2 files changed, 12 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 3e300ed0ef..e7589fad72 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,12 @@
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-19 Chris Toshok <toshok@ximian.com>
+
* gui/widgets/e-minicard-label.c (set_colors): if we've got focus,
set the background of the rect to bg[NORMAL], and the fill color
of the text and label to text[NORMAL]. This will make the
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index ba18f65e63..f90df5f65a 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -601,6 +601,11 @@ ensure_completion_uris_exist()
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;