[telepathy-glib/master] Separate dbus.h into dbus.h and dbus-daemon.h
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon Aug 17 05:28:49 PDT 2009
The latter is not #includable directly.
---
telepathy-glib/Makefile.am | 1 +
telepathy-glib/dbus-daemon.h | 82 ++++++++++++++++++++++++++++++++++++++++++
telepathy-glib/dbus.h | 55 +++-------------------------
3 files changed, 88 insertions(+), 50 deletions(-)
create mode 100644 telepathy-glib/dbus-daemon.h
diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index 097dc0b..6844be9 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -140,6 +140,7 @@ our_headers = \
contact.h \
contacts-mixin.h \
dbus.h \
+ dbus-daemon.h \
dbus-properties-mixin.h \
defs.h \
debug.h \
diff --git a/telepathy-glib/dbus-daemon.h b/telepathy-glib/dbus-daemon.h
new file mode 100644
index 0000000..72df7a9
--- /dev/null
+++ b/telepathy-glib/dbus-daemon.h
@@ -0,0 +1,82 @@
+/*
+ * dbus-daemon.h - Header for TpDBusDaemon
+ *
+ * Copyright (C) 2005-2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2005-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 __TELEPATHY_DBUS_DAEMON_H__
+#define __TELEPATHY_DBUS_DAEMON_H__
+
+#ifndef __TP_IN_DBUS_H__
+#error dbus-daemon.h not to be used directly, #include <telepathy-glib/dbus.h>
+#endif
+
+#include <telepathy-glib/proxy.h>
+
+G_BEGIN_DECLS
+
+/* TpDBusDaemon is typedef'd in proxy.h */
+typedef struct _TpDBusDaemonPrivate TpDBusDaemonPrivate;
+typedef struct _TpDBusDaemonClass TpDBusDaemonClass;
+GType tp_dbus_daemon_get_type (void);
+
+#define TP_TYPE_DBUS_DAEMON \
+ (tp_dbus_daemon_get_type ())
+#define TP_DBUS_DAEMON(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_DBUS_DAEMON, \
+ TpDBusDaemon))
+#define TP_DBUS_DAEMON_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_DBUS_DAEMON, \
+ TpDBusDaemonClass))
+#define TP_IS_DBUS_DAEMON(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_DBUS_DAEMON))
+#define TP_IS_DBUS_DAEMON_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_DBUS_DAEMON))
+#define TP_DBUS_DAEMON_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_DBUS_DAEMON, \
+ TpDBusDaemonClass))
+
+TpDBusDaemon *tp_dbus_daemon_dup (GError **error);
+
+TpDBusDaemon *tp_dbus_daemon_new (DBusGConnection *connection);
+
+void tp_dbus_daemon_init_known_interfaces (void);
+
+typedef void (*TpDBusDaemonNameOwnerChangedCb) (TpDBusDaemon *bus_daemon,
+ const gchar *name, const gchar *new_owner, gpointer user_data);
+
+void tp_dbus_daemon_watch_name_owner (TpDBusDaemon *self,
+ const gchar *name, TpDBusDaemonNameOwnerChangedCb callback,
+ gpointer user_data, GDestroyNotify destroy);
+
+gboolean tp_dbus_daemon_cancel_name_owner_watch (TpDBusDaemon *self,
+ const gchar *name, TpDBusDaemonNameOwnerChangedCb callback,
+ gconstpointer user_data);
+
+gboolean tp_dbus_daemon_request_name (TpDBusDaemon *self,
+ const gchar *well_known_name, gboolean idempotent, GError **error);
+gboolean tp_dbus_daemon_release_name (TpDBusDaemon *self,
+ const gchar *well_known_name, GError **error);
+
+const gchar *tp_dbus_daemon_get_unique_name (TpDBusDaemon *self);
+
+G_END_DECLS
+
+#include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
+
+#endif
diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h
index 54195b5..4a4b6bf 100644
--- a/telepathy-glib/dbus.h
+++ b/telepathy-glib/dbus.h
@@ -1,8 +1,8 @@
/*
* dbus.h - Header for D-Bus utilities
*
- * Copyright (C) 2005-2007 Collabora Ltd. <http://www.collabora.co.uk/>
- * Copyright (C) 2005-2007 Nokia Corporation
+ * Copyright (C) 2005-2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2005-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
@@ -21,59 +21,15 @@
#ifndef __TELEPATHY_DBUS_H__
#define __TELEPATHY_DBUS_H__
+#define __TP_IN_DBUS_H__
-#include <telepathy-glib/proxy.h>
+#include <telepathy-glib/dbus-daemon.h>
G_BEGIN_DECLS
void tp_dbus_g_method_return_not_implemented (DBusGMethodInvocation *context);
DBusGConnection * tp_get_bus (void);
-/* TpDBusDaemon is typedef'd in proxy.h */
-typedef struct _TpDBusDaemonPrivate TpDBusDaemonPrivate;
-typedef struct _TpDBusDaemonClass TpDBusDaemonClass;
-GType tp_dbus_daemon_get_type (void);
-
-#define TP_TYPE_DBUS_DAEMON \
- (tp_dbus_daemon_get_type ())
-#define TP_DBUS_DAEMON(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_DBUS_DAEMON, \
- TpDBusDaemon))
-#define TP_DBUS_DAEMON_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_DBUS_DAEMON, \
- TpDBusDaemonClass))
-#define TP_IS_DBUS_DAEMON(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_DBUS_DAEMON))
-#define TP_IS_DBUS_DAEMON_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_DBUS_DAEMON))
-#define TP_DBUS_DAEMON_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_DBUS_DAEMON, \
- TpDBusDaemonClass))
-
-TpDBusDaemon *tp_dbus_daemon_dup (GError **error);
-
-TpDBusDaemon *tp_dbus_daemon_new (DBusGConnection *connection);
-
-void tp_dbus_daemon_init_known_interfaces (void);
-
-typedef void (*TpDBusDaemonNameOwnerChangedCb) (TpDBusDaemon *bus_daemon,
- const gchar *name, const gchar *new_owner, gpointer user_data);
-
-void tp_dbus_daemon_watch_name_owner (TpDBusDaemon *self,
- const gchar *name, TpDBusDaemonNameOwnerChangedCb callback,
- gpointer user_data, GDestroyNotify destroy);
-
-gboolean tp_dbus_daemon_cancel_name_owner_watch (TpDBusDaemon *self,
- const gchar *name, TpDBusDaemonNameOwnerChangedCb callback,
- gconstpointer user_data);
-
-gboolean tp_dbus_daemon_request_name (TpDBusDaemon *self,
- const gchar *well_known_name, gboolean idempotent, GError **error);
-gboolean tp_dbus_daemon_release_name (TpDBusDaemon *self,
- const gchar *well_known_name, GError **error);
-
-const gchar *tp_dbus_daemon_get_unique_name (TpDBusDaemon *self);
-
typedef enum
{
TP_DBUS_NAME_TYPE_UNIQUE = 1,
@@ -170,6 +126,5 @@ DBusGProxy * tp_get_bus_proxy (void) G_GNUC_DEPRECATED;
G_END_DECLS
-#include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
-
+#undef __TP_IN_DBUS_H__
#endif /* __TELEPATHY_DBUS_H__ */
--
1.5.6.5
More information about the telepathy-commits
mailing list