Index: bbdb.c
===================================================================
--- bbdb.c	(revision 34550)
+++ bbdb.c	(working copy)
@@ -268,9 +268,17 @@ bbdb_open_addressbook (int type)
 
 	gboolean     status;
 	GError      *error = NULL;
-	
+	gboolean enable = TRUE;	
 	gconf = gconf_client_get_default ();
 
+	/* Check to see if we're supposed to be running */
+	if (type == AUTOMATIC_CONTACTS_ADDRESSBOOK)
+		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);
