[telepathy-glib/master] account{, -manager}: remove _get_*_features to internal headers
Jonny Lamb
jonny.lamb at collabora.co.uk
Sat Sep 26 04:36:27 PDT 2009
Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
docs/reference/telepathy-glib-sections.txt | 6 ----
telepathy-glib/Makefile.am | 2 +
telepathy-glib/account-internal.h | 37 +++++++++++++++++++++++++
telepathy-glib/account-manager-internal.h | 40 ++++++++++++++++++++++++++++
telepathy-glib/account-manager.c | 14 +++++----
telepathy-glib/account-manager.h | 9 ------
telepathy-glib/account.c | 13 +++++----
telepathy-glib/account.h | 6 ----
8 files changed, 94 insertions(+), 33 deletions(-)
create mode 100644 telepathy-glib/account-internal.h
create mode 100644 telepathy-glib/account-manager-internal.h
diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index 3612d8f..3356fe0 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -3029,9 +3029,6 @@ TP_ACCOUNT_FEATURE_CORE
tp_account_is_prepared
tp_account_prepare_async
tp_account_prepare_finish
-tp_account_get_requested_features
-tp_account_get_actual_features
-tp_account_get_missing_features
<SUBSECTION Private>
tp_account_get_feature_quark_core
<SUBSECTION>
@@ -3080,9 +3077,6 @@ TP_ACCOUNT_MANAGER_FEATURE_CORE
tp_account_manager_is_prepared
tp_account_manager_prepare_async
tp_account_manager_prepare_finish
-tp_account_manager_get_requested_features
-tp_account_manager_get_actual_features
-tp_account_manager_get_missing_features
<SUBSECTION Private>
tp_account_manager_get_feature_quark_core
<SUBSECTION>
diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index a1f6cf9..a96f534 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -279,7 +279,9 @@ check-local: check-coding-style
libtelepathy_glib_internal_la_LIBADD = $(ALL_LIBS)
libtelepathy_glib_internal_la_SOURCES = \
account.c \
+ account-internal.h \
account-manager.c \
+ account-manager-internal.h \
base-connection.c \
base-connection-manager.c \
channel.c \
diff --git a/telepathy-glib/account-internal.h b/telepathy-glib/account-internal.h
new file mode 100644
index 0000000..3198c0c
--- /dev/null
+++ b/telepathy-glib/account-internal.h
@@ -0,0 +1,37 @@
+/*
+ * TpAccount - proxy for a Telepathy account (internals)
+ *
+ * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2009 Nokia Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef TP_ACCOUNT_INTERNAL_H
+#define TP_ACCOUNT_INTERNAL_H
+
+#include <telepathy-glib/account.h>
+
+G_BEGIN_DECLS
+
+const GQuark * _tp_account_get_requested_features (TpAccount *account);
+
+const GQuark * _tp_account_get_actual_features (TpAccount *account);
+
+const GQuark * _tp_account_get_missing_features (TpAccount *account);
+
+G_END_DECLS
+
+#endif
diff --git a/telepathy-glib/account-manager-internal.h b/telepathy-glib/account-manager-internal.h
new file mode 100644
index 0000000..18dbeef
--- /dev/null
+++ b/telepathy-glib/account-manager-internal.h
@@ -0,0 +1,40 @@
+/*
+ * TpAccountManager - proxy for a Telepathy account manager (internals)
+ *
+ * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2009 Nokia Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef TP_ACCOUNT_MANAGER_INTERNAL_H
+#define TP_ACCOUNT_MANAGER_INTERNAL_H
+
+#include <telepathy-glib/account-manager.h>
+
+G_BEGIN_DECLS
+
+const GQuark * _tp_account_manager_get_requested_features (
+ TpAccountManager *manager);
+
+const GQuark * _tp_account_manager_get_actual_features (
+ TpAccountManager *manager);
+
+const GQuark * _tp_account_manager_get_missing_features (
+ TpAccountManager *manager);
+
+G_END_DECLS
+
+#endif
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 3babc66..3a9cefc 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "telepathy-glib/account-manager-internal.h"
+
#include <telepathy-glib/defs.h>
#include <telepathy-glib/gtypes.h>
#include <telepathy-glib/interfaces.h>
@@ -1390,7 +1392,7 @@ tp_account_manager_prepare_finish (TpAccountManager *manager,
}
/**
- * tp_account_manager_get_requested_features:
+ * _tp_account_manager_get_requested_features:
* @manager: a #TpAccountManager
*
* <!-- -->
@@ -1400,7 +1402,7 @@ tp_account_manager_prepare_finish (TpAccountManager *manager,
* Since: 0.7.UNRELEASED
*/
const GQuark *
-tp_account_manager_get_requested_features (TpAccountManager *manager)
+_tp_account_manager_get_requested_features (TpAccountManager *manager)
{
g_return_val_if_fail (TP_IS_ACCOUNT_MANAGER (manager), NULL);
@@ -1408,7 +1410,7 @@ tp_account_manager_get_requested_features (TpAccountManager *manager)
}
/**
- * tp_account_manager_get_actual_features:
+ * _tp_account_manager_get_actual_features:
* @manager: a #TpAccountManager
*
* <!-- -->
@@ -1418,7 +1420,7 @@ tp_account_manager_get_requested_features (TpAccountManager *manager)
* Since: 0.7.UNRELEASED
*/
const GQuark *
-tp_account_manager_get_actual_features (TpAccountManager *manager)
+_tp_account_manager_get_actual_features (TpAccountManager *manager)
{
g_return_val_if_fail (TP_IS_ACCOUNT_MANAGER (manager), NULL);
@@ -1426,7 +1428,7 @@ tp_account_manager_get_actual_features (TpAccountManager *manager)
}
/**
- * tp_account_manager_get_missing_features:
+ * _tp_account_manager_get_missing_features:
* @manager: a #TpAccountManager
*
* <!-- -->
@@ -1436,7 +1438,7 @@ tp_account_manager_get_actual_features (TpAccountManager *manager)
* Since: 0.7.UNRELEASED
*/
const GQuark *
-tp_account_manager_get_missing_features (TpAccountManager *manager)
+_tp_account_manager_get_missing_features (TpAccountManager *manager)
{
g_return_val_if_fail (TP_IS_ACCOUNT_MANAGER (manager), NULL);
diff --git a/telepathy-glib/account-manager.h b/telepathy-glib/account-manager.h
index f5dac11..51099fb 100644
--- a/telepathy-glib/account-manager.h
+++ b/telepathy-glib/account-manager.h
@@ -103,15 +103,6 @@ void tp_account_manager_prepare_async (TpAccountManager *manager,
gboolean tp_account_manager_prepare_finish (TpAccountManager *manager,
GAsyncResult *result, GError **error);
-const GQuark * tp_account_manager_get_requested_features (
- TpAccountManager *manager);
-
-const GQuark * tp_account_manager_get_actual_features (
- TpAccountManager *manager);
-
-const GQuark * tp_account_manager_get_missing_features (
- TpAccountManager *manager);
-
G_END_DECLS
#include <telepathy-glib/_gen/tp-cli-account-manager.h>
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index f043681..aa7a215 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -21,6 +21,7 @@
#include <string.h>
+#include "telepathy-glib/account-internal.h"
#include "telepathy-glib/account.h"
#include <telepathy-glib/dbus.h>
@@ -2709,7 +2710,7 @@ tp_account_prepare_finish (TpAccount *account,
}
/**
- * tp_account_get_requested_features:
+ * _tp_account_get_requested_features:
* @account: a #TpAccount
*
* <!-- -->
@@ -2719,7 +2720,7 @@ tp_account_prepare_finish (TpAccount *account,
* Since: 0.7.UNRELEASED
*/
const GQuark *
-tp_account_get_requested_features (TpAccount *account)
+_tp_account_get_requested_features (TpAccount *account)
{
g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
@@ -2727,7 +2728,7 @@ tp_account_get_requested_features (TpAccount *account)
}
/**
- * tp_account_get_actual_features:
+ * _tp_account_get_actual_features:
* @account: a #TpAccount
*
* <!-- -->
@@ -2737,7 +2738,7 @@ tp_account_get_requested_features (TpAccount *account)
* Since: 0.7.UNRELEASED
*/
const GQuark *
-tp_account_get_actual_features (TpAccount *account)
+_tp_account_get_actual_features (TpAccount *account)
{
g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
@@ -2745,7 +2746,7 @@ tp_account_get_actual_features (TpAccount *account)
}
/**
- * tp_account_get_missing_features:
+ * _tp_account_get_missing_features:
* @account: a #TpAccount
*
* <!-- -->
@@ -2756,7 +2757,7 @@ tp_account_get_actual_features (TpAccount *account)
* Since: 0.7.UNRELEASED
*/
const GQuark *
-tp_account_get_missing_features (TpAccount *account)
+_tp_account_get_missing_features (TpAccount *account)
{
g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index 1dbf436..b9d9feb 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -186,12 +186,6 @@ void tp_account_prepare_async (TpAccount *account, const GQuark *features,
gboolean tp_account_prepare_finish (TpAccount *account, GAsyncResult *result,
GError **error);
-const GQuark * tp_account_get_requested_features (TpAccount *account);
-
-const GQuark * tp_account_get_actual_features (TpAccount *account);
-
-const GQuark * tp_account_get_missing_features (TpAccount *account);
-
G_END_DECLS
#include <telepathy-glib/_gen/tp-cli-account.h>
--
1.5.6.5
More information about the telepathy-commits
mailing list