From 84339b3be5a771406fcd5898bbd21dc1c5b98c82 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Jun 2011 08:54:20 +0200 Subject: Do not use deprecated EBook/ECal API --- plugins/bbdb/bbdb.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'plugins/bbdb/bbdb.h') diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index fe7b998274..cbeb4ebb42 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -37,14 +37,17 @@ #define GAIM_ADDRESSBOOK 1 #define AUTOMATIC_CONTACTS_ADDRESSBOOK 0 +#include +#include + /* bbdb.c */ -/* creates an EBook for a given type (gaim or contacts), but doesn't open it; +/* creates an EBookClient for a given type (gaim or contacts), but doesn't open it; this function should be called in a main thread. */ -EBook *bbdb_create_ebook (gint type); +EBookClient *bbdb_create_book_client (gint type); -/* opens an EBook. Returns false if it fails, and unrefs the book too; +/* opens an EBookClient. Returns false if it fails, and unrefs the book too; this function can be called in any thread */ -gboolean bbdb_open_ebook (EBook *book); +gboolean bbdb_open_book_client (EBookClient *client); gboolean bbdb_check_gaim_enabled (void); -- cgit v1.2.3 From 777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 16 Aug 2011 11:25:56 -0400 Subject: Coding style and whitespace cleanup. --- plugins/bbdb/bbdb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/bbdb/bbdb.h') diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index cbeb4ebb42..82951a7566 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -42,11 +42,11 @@ /* bbdb.c */ /* creates an EBookClient for a given type (gaim or contacts), but doesn't open it; - this function should be called in a main thread. */ + * this function should be called in a main thread. */ EBookClient *bbdb_create_book_client (gint type); /* opens an EBookClient. Returns false if it fails, and unrefs the book too; - this function can be called in any thread */ + * this function can be called in any thread */ gboolean bbdb_open_book_client (EBookClient *client); gboolean bbdb_check_gaim_enabled (void); -- cgit v1.2.3 From 73656ae57ee8a42678e09b07c5d85fe45b9844a6 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 17 Nov 2011 17:19:48 +0100 Subject: Port autocontacts plugin to GSettings --- plugins/bbdb/bbdb.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/bbdb/bbdb.h') diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index 82951a7566..3bd8cce880 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -22,14 +22,14 @@ #define __BBDB_H__ /* Where to store the config values */ -#define GCONF_ROOT_PATH "/apps/evolution/autocontacts" -#define GCONF_KEY_ENABLE GCONF_ROOT_PATH "/enable_autocontacts" -#define GCONF_KEY_ENABLE_GAIM GCONF_ROOT_PATH "/auto_sync_gaim" -#define GCONF_KEY_WHICH_ADDRESSBOOK GCONF_ROOT_PATH "/addressbook_source" -#define GCONF_KEY_WHICH_ADDRESSBOOK_GAIM GCONF_ROOT_PATH "/gaim_addressbook_source" -#define GCONF_KEY_GAIM_LAST_SYNC_TIME GCONF_ROOT_PATH "/gaim_last_sync_time" -#define GCONF_KEY_GAIM_LAST_SYNC_MD5 GCONF_ROOT_PATH "/gaim_last_sync_md5" -#define GCONF_KEY_GAIM_CHECK_INTERVAL GCONF_ROOT_PATH "/gaim_check_interval" +#define CONF_SCHEMA "org.gnome.evolution.eplugin.autocontacts" +#define CONF_KEY_ENABLE "enable" +#define CONF_KEY_ENABLE_GAIM "auto-sync-gaim" +#define CONF_KEY_WHICH_ADDRESSBOOK "addressbook-source" +#define CONF_KEY_WHICH_ADDRESSBOOK_GAIM "gaim-addressbook-source" +#define CONF_KEY_GAIM_LAST_SYNC_TIME "gaim-last-sync-time" +#define CONF_KEY_GAIM_LAST_SYNC_MD5 "gaim-last-sync-md5" +#define CONF_KEY_GAIM_CHECK_INTERVAL "gaim-check-interval" /* How often to poll the buddy list for changes (every two minutes is default) */ #define BBDB_BLIST_DEFAULT_CHECK_INTERVAL (2 * 60) -- cgit v1.2.3 From 2e60b6a4a21105bb4a1e2badd1be51b3e684d165 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Nov 2011 17:53:07 -0500 Subject: Tweak GSettings schemas. - Don't use the term "eplugin" for modules. - Use the term "plugin" instead of "eplugin" for plugins. - Split SpamAssassin settings into a separate schema. --- plugins/bbdb/bbdb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/bbdb/bbdb.h') diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index 3bd8cce880..9104e0896b 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -22,7 +22,7 @@ #define __BBDB_H__ /* Where to store the config values */ -#define CONF_SCHEMA "org.gnome.evolution.eplugin.autocontacts" +#define CONF_SCHEMA "org.gnome.evolution.plugin.autocontacts" #define CONF_KEY_ENABLE "enable" #define CONF_KEY_ENABLE_GAIM "auto-sync-gaim" #define CONF_KEY_WHICH_ADDRESSBOOK "addressbook-source" -- cgit v1.2.3