aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/bbdb
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-09-29 17:26:24 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-09-29 17:26:24 +0800
commitde3e1486c7354ccc90f34ace8f3cfd1fe3344695 (patch)
treefe6cf248cc075b91bbeedcf6b84e5a2cff5e897f /plugins/bbdb
parent98c25534d5d9d354700843d21b92a899c7755d1b (diff)
downloadgsoc2013-evolution-de3e1486c7354ccc90f34ace8f3cfd1fe3344695.tar
gsoc2013-evolution-de3e1486c7354ccc90f34ace8f3cfd1fe3344695.tar.gz
gsoc2013-evolution-de3e1486c7354ccc90f34ace8f3cfd1fe3344695.tar.bz2
gsoc2013-evolution-de3e1486c7354ccc90f34ace8f3cfd1fe3344695.tar.lz
gsoc2013-evolution-de3e1486c7354ccc90f34ace8f3cfd1fe3344695.tar.xz
gsoc2013-evolution-de3e1486c7354ccc90f34ace8f3cfd1fe3344695.tar.zst
gsoc2013-evolution-de3e1486c7354ccc90f34ace8f3cfd1fe3344695.zip
** Fix for bug #497928
2008-09-29 Milan Crha <mcrha@redhat.com> ** Fix for bug #497928 * bbdb.c: (source_changed_cb), (gaim_source_changed_cb): Set URI to empty string when user deletes previously selected source. svn path=/trunk/; revision=36469
Diffstat (limited to 'plugins/bbdb')
-rw-r--r--plugins/bbdb/ChangeLog7
-rw-r--r--plugins/bbdb/bbdb.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 7ec0732ef3..471a76aa21 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-29 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #497928
+
+ * bbdb.c: (source_changed_cb), (gaim_source_changed_cb):
+ Set URI to empty string when user deletes previously selected source.
+
2008-09-19 Sankar P <psankar@novell.com>
License Changes
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 73f02846a0..a2ec60d243 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -435,12 +435,11 @@ source_changed_cb (ESourceComboBox *source_combo_box,
GError *error = NULL;
source = e_source_combo_box_get_active (source_combo_box);
- g_return_if_fail (source != NULL);
gconf_client_set_string (
stuff->target->gconf,
GCONF_KEY_WHICH_ADDRESSBOOK,
- e_source_get_uri (source), &error);
+ source ? e_source_get_uri (source) : "", &error);
if (error != NULL) {
g_warning ("%s", error->message);
@@ -456,12 +455,11 @@ gaim_source_changed_cb (ESourceComboBox *source_combo_box,
GError *error = NULL;
source = e_source_combo_box_get_active (source_combo_box);
- g_return_if_fail (source != NULL);
gconf_client_set_string (
stuff->target->gconf,
GCONF_KEY_WHICH_ADDRESSBOOK_GAIM,
- e_source_get_uri (source), &error);
+ source ? e_source_get_uri (source) : "", &error);
if (error != NULL) {
g_warning ("%s", error->message);