evolution r36469 - trunk/plugins/bbdb

[mcrha svn gnome org]

Author: mcrha
Date: Mon Sep 29 09:26:24 2008
New Revision: 36469
URL: http://svn.gnome.org/viewvc/evolution?rev=36469&view=rev

Log:
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.



Modified:
   trunk/plugins/bbdb/ChangeLog
   trunk/plugins/bbdb/bbdb.c

Modified: trunk/plugins/bbdb/bbdb.c
==============================================================================
--- trunk/plugins/bbdb/bbdb.c	(original)
+++ trunk/plugins/bbdb/bbdb.c	Mon Sep 29 09:26:24 2008
@@ -435,12 +435,11 @@
 	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 @@
 	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);