aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-12-03 15:31:16 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-12-03 15:31:16 +0800
commit0432e0fb2709cf09a898a8c9cf914ed7e81e88b1 (patch)
tree1f8d709a9ee1d9fb290773fab8ad18d70eef7341
parentb95c68f2d21888453a8237c51735b63e82b9beb8 (diff)
downloadgsoc2013-evolution-0432e0fb2709cf09a898a8c9cf914ed7e81e88b1.tar.gz
gsoc2013-evolution-0432e0fb2709cf09a898a8c9cf914ed7e81e88b1.tar.zst
gsoc2013-evolution-0432e0fb2709cf09a898a8c9cf914ed7e81e88b1.zip
** Fix for bug #391062
* bbdb.c: (bbdb_open_addressbook): Dont add contacts, if it is enabled to do so. svn path=/trunk/; revision=34626
-rw-r--r--plugins/bbdb/ChangeLog7
-rw-r--r--plugins/bbdb/bbdb.c10
2 files changed, 16 insertions, 1 deletions
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index a7b0b3ec75..e90bb95bf6 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-03 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #391062
+
+ * bbdb.c: (bbdb_open_addressbook): Dont add contacts, if it is enabled
+ to do so.
+
2007-10-26 Kjartan Maraas <kmaraas@gnome.org>
* bbdb.c: (bbdb_check_gaim_enabled), (source_changed_cb):
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 9155bcb93b..ad02eb2aca 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -307,9 +307,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);