diff -u evo/evolution-2.8.1/plugins/bbdb/bbdb.c evolution-2.8.1/plugins/bbdb/bbdb.c
--- evo/evolution-2.8.1/plugins/bbdb/bbdb.c	2006-08-19 00:49:27.000000000 -0500
+++ evolution-2.8.1/plugins/bbdb/bbdb.c	2006-12-04 01:24:52.000000000 -0500
@@ -96,7 +96,8 @@
 static gboolean
 bbdb_timeout (gpointer data)
 {
-	bbdb_sync_buddy_list_check ();
+	if (bbdb_check_gaim_enabled ())
+		bbdb_sync_buddy_list_check ();
 
 	return TRUE;
 }
@@ -260,22 +261,13 @@
 	
 	gconf = gconf_client_get_default ();
 
-	/* Check to see if we're supposed to be running */
-	if (type == GAIM_ADDRESSBOOK)
-		enable = gconf_client_get_bool (gconf, GCONF_KEY_ENABLE_GAIM, NULL);
-	else
-		enable = gconf_client_get_bool (gconf, GCONF_KEY_ENABLE, NULL);
-	if (! enable) {
-		g_object_unref (G_OBJECT (gconf));
-		return NULL;
-	}
-
 	/* Open the appropriate addresbook. */
 	if (type == GAIM_ADDRESSBOOK)
 		uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL);
 	else
 		uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL);
 	g_object_unref (G_OBJECT (gconf));
+
 	if (uri == NULL)
 		book = e_book_new_system_addressbook (&error);
 	else {
Only in evolution-2.8.1/plugins/bbdb/: bbdb.lo
Only in evolution-2.8.1/plugins/bbdb/: .deps
diff -u evo/evolution-2.8.1/plugins/bbdb/gaimbuddies.c evolution-2.8.1/plugins/bbdb/gaimbuddies.c
--- evo/evolution-2.8.1/plugins/bbdb/gaimbuddies.c	2006-08-19 00:49:27.000000000 -0500
+++ evolution-2.8.1/plugins/bbdb/gaimbuddies.c	2006-12-03 23:00:52.000000000 -0500
@@ -85,11 +85,6 @@
 
 	gconf = gconf_client_get_default ();
 	
-	if (! gconf_client_get_bool (gconf, GCONF_KEY_ENABLE_GAIM, NULL)) {
-		g_object_unref (G_OBJECT (gconf));
-		return;
-	}
-
 	blist_path = g_build_path ("/", getenv ("HOME"), ".gaim/blist.xml", NULL);
 	if (stat (blist_path, &statbuf) < 0) {
 		g_free (blist_path);
Only in evolution-2.8.1/plugins/bbdb/: gaimbuddies.lo
Only in evolution-2.8.1/plugins/bbdb/: liborg-gnome-evolution-bbdb.la
Only in evolution-2.8.1/plugins/bbdb/: .libs
Only in evolution-2.8.1/plugins/bbdb/: Makefile
Only in evolution-2.8.1/plugins/bbdb/: org-gnome-evolution-bbdb.eplug
