diff options
Diffstat (limited to 'plugins/bbdb')
| -rw-r--r-- | plugins/bbdb/ChangeLog | 11 | ||||
| -rw-r--r-- | plugins/bbdb/bbdb.c | 14 | ||||
| -rw-r--r-- | plugins/bbdb/gaimbuddies.c | 5 |
3 files changed, 14 insertions, 16 deletions
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index 922fade265..9a051b2ae3 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,14 @@ +2007-08-06 Sankar P <psankar@novell.com> + + * Committed on behalf of Diego Escalante Urrelo + <diegoe@gnome.org> + + * bbdb.c: (bbdb_timeout), (bbdb_open_addressbook): + * gaimbuddies.c: (bbdb_sync_buddy_list_check): + "Synchronize now" should work even if periodic checking + is not enabled. + Fixes bug #377309 + 2007-06-25 Milan Crha <mcrha@redhat.com> ** Fix for bug #334140 diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 8085eaf657..08b5a78c33 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -96,7 +96,8 @@ e_plugin_lib_enable (EPluginLib *ep, int enable) static gboolean bbdb_timeout (gpointer data) { - bbdb_sync_buddy_list_check (); + if (bbdb_check_gaim_enabled ()) + bbdb_sync_buddy_list_check (); return TRUE; } @@ -272,22 +273,13 @@ bbdb_open_addressbook (int type) 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 { diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index e8c34bd01f..b77a058970 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -85,11 +85,6 @@ bbdb_sync_buddy_list_check (void) 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); |