[telepathy-glib/master] account{, -manager}: make _FEATURE_CORE expand to a function call

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 docs/reference/telepathy-glib-sections.txt |    2 +
 telepathy-glib/account-manager.c           |   16 ++++++++++++++
 telepathy-glib/account-manager.h           |    4 ++-
 telepathy-glib/account.c                   |   32 +++++++++++++++++++++------
 telepathy-glib/account.h                   |    4 ++-
 5 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index 48055db..eebeecd 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -3034,6 +3034,7 @@ tp_account_get_avatar_async
 tp_account_get_avatar_finish
 <SUBSECTION>
 TP_ACCOUNT_FEATURE_CORE
+tp_account_get_feature_quark_core
 tp_account_is_ready
 tp_account_prepare_async
 tp_account_prepare_finish
@@ -3085,6 +3086,7 @@ tp_account_manager_get_requested_global_presence
 tp_account_manager_request_global_presence
 <SUBSECTION>
 TP_ACCOUNT_MANAGER_FEATURE_CORE
+tp_account_manager_get_feature_quark_core
 tp_account_manager_is_ready
 tp_account_manager_prepare_async
 tp_account_manager_prepare_finish
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 42a0e95..6f82e26 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -115,6 +115,22 @@ static guint signals[LAST_SIGNAL];
 
 G_DEFINE_TYPE (TpAccountManager, tp_account_manager, TP_TYPE_PROXY);
 
+/**
+ * tp_account_manager_get_feature_quark_core:
+ *
+ * <!-- -->
+ *
+ * Returns: the quark used for representing the core feature of a
+ *          #TpAccountManager
+ *
+ * Since: 0.7.UNRELEASED
+ */
+GQuark
+tp_account_manager_get_feature_quark_core (void)
+{
+  return g_quark_from_static_string ("tp-account-manager-feature-core");
+}
+
 static TpAccountManagerFeature *
 _tp_account_manager_get_feature (TpAccountManager *self,
     GQuark feature,
diff --git a/telepathy-glib/account-manager.h b/telepathy-glib/account-manager.h
index a5eae80..8d878aa 100644
--- a/telepathy-glib/account-manager.h
+++ b/telepathy-glib/account-manager.h
@@ -65,7 +65,9 @@ GType tp_account_manager_get_type (void);
                               TpAccountManagerClass))
 
 #define TP_ACCOUNT_MANAGER_FEATURE_CORE \
-  g_quark_from_static_string ("tp-account-manager-feature-core")
+  tp_account_manager_get_feature_quark_core ()
+
+GQuark tp_account_manager_get_feature_quark_core (void);
 
 TpAccountManager *tp_account_manager_new (TpDBusDaemon *bus_daemon);
 
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 759b23f..2a93fd4 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -157,6 +157,31 @@ enum {
   PROP_NICKNAME
 };
 
+/**
+ * TP_ACCOUNT_FEATURE_CORE:
+ *
+ * Expands to a call to a function that returns a quark for the "core" feature
+ * on a #TpAccount.
+ *
+ * Since: 0.7.UNRELEASED
+ */
+
+/**
+ * tp_account_get_feature_quark_core:
+ *
+ * <!-- -->
+ *
+ * Returns: the quark used for representing the core feature of a
+ *          #TpAccount
+ *
+ * Since: 0.7.UNRELEASED
+ */
+GQuark
+tp_account_get_feature_quark_core (void)
+{
+  return g_quark_from_static_string ("tp-account-feature-core");
+}
+
 static void
 tp_account_init (TpAccount *self)
 {
@@ -2457,13 +2482,6 @@ tp_account_get_avatar_finish (TpAccount *account,
 }
 
 /**
- * TP_ACCOUNT_FEATURE_CORE:
- *
- * Expands to a call to a function that returns a quark for the "core" feature
- * on a #TpAccount.
- */
-
-/**
  * tp_account_is_ready:
  * @account: a #TpAccount
  * @feature: a feature which is required
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index 2af0077..7ddb4b2 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -67,7 +67,9 @@ GType tp_account_get_type (void);
                               TpAccountClass))
 
 #define TP_ACCOUNT_FEATURE_CORE \
-  g_quark_from_static_string ("tp-account-feature-core")
+  tp_account_get_feature_quark_core ()
+
+GQuark tp_account_get_feature_quark_core (void);
 
 TpAccount *tp_account_new (TpDBusDaemon *bus_daemon, const gchar *object_path,
     GError **error);
-- 
1.5.6.5