[telepathy-mission-control/master] Slim down public headers, move private stuff into private headers
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon May 11 04:30:53 PDT 2009
---
src/mcd-account-compat.h | 6 +-----
src/mcd-account-conditions.h | 12 +-----------
src/mcd-account-manager-priv.h | 11 +++++++++++
src/mcd-account-manager-query.c | 2 ++
src/mcd-account-manager-query.h | 12 +-----------
src/mcd-account-manager.h | 2 --
src/mcd-account-priv.h | 17 +++++++++++++++++
src/mcd-account-requests.h | 8 +-------
src/mcd-account-stats.h | 13 +------------
9 files changed, 35 insertions(+), 48 deletions(-)
diff --git a/src/mcd-account-compat.h b/src/mcd-account-compat.h
index 6b654c6..d610486 100644
--- a/src/mcd-account-compat.h
+++ b/src/mcd-account-compat.h
@@ -24,13 +24,9 @@
#ifndef __MCD_ACCOUNT_COMPAT_H__
#define __MCD_ACCOUNT_COMPAT_H__
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
#include <libmcclient/mc-profile.h>
-/* auto-generated stubs */
-#include "_gen/svc-Account_Interface_Compat.h"
-#include "mcd-dbusprop.h"
+#include "mcd-account.h"
G_BEGIN_DECLS
diff --git a/src/mcd-account-conditions.h b/src/mcd-account-conditions.h
index cba7a64..cd8f75b 100644
--- a/src/mcd-account-conditions.h
+++ b/src/mcd-account-conditions.h
@@ -24,20 +24,10 @@
#ifndef __MCD_ACCOUNT_CONDITIONS_H__
#define __MCD_ACCOUNT_CONDITIONS_H__
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-/* auto-generated stubs */
-#include "_gen/svc-Account_Interface_Conditions.h"
-
-#include "mcd-dbusprop.h"
+#include "mcd-account.h"
G_BEGIN_DECLS
-extern const McdDBusProp account_conditions_properties[];
-
-void account_conditions_iface_init (McSvcAccountInterfaceConditionsClass *iface,
- gpointer iface_data);
-
GHashTable *mcd_account_get_conditions (McdAccount *account);
G_END_DECLS
diff --git a/src/mcd-account-manager-priv.h b/src/mcd-account-manager-priv.h
index 80465d8..1e44b8b 100644
--- a/src/mcd-account-manager-priv.h
+++ b/src/mcd-account-manager-priv.h
@@ -26,6 +26,12 @@
#include "mcd-account-manager.h"
+#include "mcd-dbusprop.h"
+
+/* auto-generated stubs */
+#include "_gen/svc-Account_Manager.h"
+#include "_gen/svc-Account_Manager_Interface_Query.h"
+
G_BEGIN_DECLS
G_GNUC_INTERNAL void _mcd_account_manager_setup
@@ -49,6 +55,11 @@ G_GNUC_INTERNAL
void _mcd_account_manager_store_account_connections
(McdAccountManager *manager);
+extern const McdDBusProp account_manager_query_properties[];
+
+void account_manager_query_iface_init (McSvcAccountManagerInterfaceQueryClass *iface,
+ gpointer iface_data);
+
G_END_DECLS
#endif
diff --git a/src/mcd-account-manager-query.c b/src/mcd-account-manager-query.c
index cad522a..bf7ee0c 100644
--- a/src/mcd-account-manager-query.c
+++ b/src/mcd-account-manager-query.c
@@ -37,6 +37,8 @@
#include "mcd-account-manager-query.h"
#include "mcd-account-manager-priv.h"
#include "mcd-account-priv.h"
+
+/* auto-generated stubs */
#include "_gen/interfaces.h"
typedef struct
diff --git a/src/mcd-account-manager-query.h b/src/mcd-account-manager-query.h
index 0786da5..6c82666 100644
--- a/src/mcd-account-manager-query.h
+++ b/src/mcd-account-manager-query.h
@@ -24,19 +24,9 @@
#ifndef __MCD_ACCOUNT_MANAGER_QUERY_H__
#define __MCD_ACCOUNT_MANAGER_QUERY_H__
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-/* auto-generated stubs */
-#include "_gen/svc-Account_Manager_Interface_Query.h"
-
-#include "mcd-dbusprop.h"
+#include <glib.h>
G_BEGIN_DECLS
-extern const McdDBusProp account_manager_query_properties[];
-
-void account_manager_query_iface_init (McSvcAccountManagerInterfaceQueryClass *iface,
- gpointer iface_data);
-
G_END_DECLS
#endif
diff --git a/src/mcd-account-manager.h b/src/mcd-account-manager.h
index 61fe973..d5b703e 100644
--- a/src/mcd-account-manager.h
+++ b/src/mcd-account-manager.h
@@ -25,8 +25,6 @@
#define __MCD_ACCOUNT_MANAGER_H__
#include <telepathy-glib/dbus.h>
-/* auto-generated stubs */
-#include "_gen/svc-Account_Manager.h"
G_BEGIN_DECLS
#define MCD_TYPE_ACCOUNT_MANAGER (mcd_account_manager_get_type ())
diff --git a/src/mcd-account-priv.h b/src/mcd-account-priv.h
index 0bc9432..831887f 100644
--- a/src/mcd-account-priv.h
+++ b/src/mcd-account-priv.h
@@ -33,6 +33,12 @@
#include "mcd-channel.h"
#include "mcd-dbusprop.h"
+/* auto-generated stubs */
+#include "_gen/svc-Account_Interface_ChannelRequests.h"
+#include "_gen/svc-Account_Interface_Compat.h"
+#include "_gen/svc-Account_Interface_Conditions.h"
+#include "_gen/svc-Account_Interface_Stats.h"
+
G_GNUC_INTERNAL void _mcd_account_connect (McdAccount *account,
GHashTable *params);
@@ -147,5 +153,16 @@ G_GNUC_INTERNAL void _mcd_account_connection_context_free
G_GNUC_INTERNAL GHashTable *_mcd_account_dup_parameters (McdAccount *account);
+extern const McdDBusProp account_conditions_properties[];
+
+void account_conditions_iface_init (McSvcAccountInterfaceConditionsClass *iface,
+ gpointer iface_data);
+
+extern const McdDBusProp account_stats_properties[];
+
+void account_stats_iface_init (McSvcAccountInterfaceStatsClass *iface,
+ gpointer iface_data);
+void account_stats_instance_init (TpSvcDBusProperties *self);
+
#endif /* __MCD_ACCOUNT_PRIV_H__ */
diff --git a/src/mcd-account-requests.h b/src/mcd-account-requests.h
index 0c70b8c..d22c2e0 100644
--- a/src/mcd-account-requests.h
+++ b/src/mcd-account-requests.h
@@ -23,13 +23,7 @@
#ifndef __MCD_ACCOUNT_REQUESTS_H__
#define __MCD_ACCOUNT_REQUESTS_H__
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-/* auto-generated stubs */
-#include "_gen/svc-Account_Interface_ChannelRequests.h"
-
-#include "mcd-channel.h"
-#include "mcd-dbusprop.h"
+#include <glib.h>
G_BEGIN_DECLS
G_END_DECLS
diff --git a/src/mcd-account-stats.h b/src/mcd-account-stats.h
index 1d42af6..3125c90 100644
--- a/src/mcd-account-stats.h
+++ b/src/mcd-account-stats.h
@@ -24,20 +24,9 @@
#ifndef __MCD_ACCOUNT_STATS_H__
#define __MCD_ACCOUNT_STATS_H__
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/enums.h>
-/* auto-generated stubs */
-#include "_gen/svc-Account_Interface_Stats.h"
-
-#include "mcd-dbusprop.h"
+#include <glib.h>
G_BEGIN_DECLS
-extern const McdDBusProp account_stats_properties[];
-
-void account_stats_iface_init (McSvcAccountInterfaceStatsClass *iface,
- gpointer iface_data);
-void account_stats_instance_init (TpSvcDBusProperties *self);
-
G_END_DECLS
#endif
--
1.5.6.5
More information about the telepathy-commits
mailing list