Attachment 58076 Details for Bug 46835 – [next 04/10] Move TpProxy, TpDBusDaemon auto-generated code to a new header

[patch] [next 04/10] Move TpProxy, TpDBusDaemon auto-generated code to a new header

0004-Move-TpProxy-TpDBusDaemon-auto-generated-code-to-a-n.patch (text/plain), 19.52 KB, created by Simon McVittie on 2012-03-06 11:27:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-03-06 11:27:41 UTC

Size: 19.52 KB

patch

obsolete

>From b7512c85fec936288a54da3324f5b9e897f385b1 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 6 Mar 2012 18:03:15 +0000
>Subject: [PATCH 04/10] Move TpProxy, TpDBusDaemon auto-generated code to a
> new header
>
>---
> docs/reference/telepathy-glib-sections.txt  |   80 +++++++++++++-------------
> examples/client/inspect-connection.c        |    1 +
> telepathy-glib/Makefile.am                  |    1 +
> telepathy-glib/account-manager.c            |    1 +
> telepathy-glib/account.c                    |    1 +
> telepathy-glib/call-channel.c               |    1 +
> telepathy-glib/call-content.c               |    1 +
> telepathy-glib/call-stream.c                |    1 +
> telepathy-glib/channel-dispatch-operation.c |    1 +
> telepathy-glib/channel-group.c              |    1 +
> telepathy-glib/channel.c                    |    1 +
> telepathy-glib/cli-misc.h                   |   31 ++++++++++
> telepathy-glib/connection-avatars.c         |    1 +
> telepathy-glib/connection-contact-info.c    |    1 +
> telepathy-glib/connection-contact-list.c    |    1 +
> telepathy-glib/connection-manager.c         |    1 +
> telepathy-glib/connection.c                 |    1 +
> telepathy-glib/dbus-daemon.c                |    1 +
> telepathy-glib/dbus-daemon.h                |    2 -
> telepathy-glib/file-transfer-channel.c      |    1 +
> telepathy-glib/proxy.c                      |    1 +
> telepathy-glib/proxy.h                      |    2 -
> telepathy-glib/text-channel.c               |    1 +
> tests/dbus/base-client.c                    |    1 +
> tests/dbus/call-cancellation.c              |    1 +
> tests/dbus/call-channel.c                   |    1 +
> tests/dbus/disconnection.c                  |    1 +
> tests/dbus/properties.c                     |    1 +
> tests/dbus/simple-approver.c                |    1 +
> tests/dbus/simple-handler.c                 |    1 +
> tests/dbus/simple-observer.c                |    1 +
> tests/lib/util.c                            |    1 +
> 32 files changed, 99 insertions(+), 44 deletions(-)
> create mode 100644 telepathy-glib/cli-misc.h
>
>diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
>index 98fc0df..fc33975 100644
>--- a/docs/reference/telepathy-glib-sections.txt
>+++ b/docs/reference/telepathy-glib-sections.txt
>@@ -1917,45 +1917,6 @@ tp_dbus_daemon_request_name
> tp_dbus_daemon_register_object
> tp_dbus_daemon_unregister_object
> tp_dbus_daemon_init_known_interfaces
>-<SUBSECTION>
>-tp_cli_dbus_daemon_call_add_match
>-tp_cli_dbus_daemon_call_get_connection_se_linux_security_context
>-tp_cli_dbus_daemon_call_get_connection_unix_process_id
>-tp_cli_dbus_daemon_call_get_connection_unix_user
>-tp_cli_dbus_daemon_call_get_id
>-tp_cli_dbus_daemon_call_get_name_owner
>-tp_cli_dbus_daemon_call_hello
>-tp_cli_dbus_daemon_call_list_activatable_names
>-tp_cli_dbus_daemon_call_list_names
>-tp_cli_dbus_daemon_call_list_queued_owners
>-tp_cli_dbus_daemon_call_name_has_owner
>-tp_cli_dbus_daemon_call_release_name
>-tp_cli_dbus_daemon_call_reload_config
>-tp_cli_dbus_daemon_call_remove_match
>-tp_cli_dbus_daemon_call_request_name
>-tp_cli_dbus_daemon_call_start_service_by_name
>-tp_cli_dbus_daemon_callback_for_add_match
>-tp_cli_dbus_daemon_callback_for_get_connection_se_linux_security_context
>-tp_cli_dbus_daemon_callback_for_get_connection_unix_process_id
>-tp_cli_dbus_daemon_callback_for_get_connection_unix_user
>-tp_cli_dbus_daemon_callback_for_get_id
>-tp_cli_dbus_daemon_callback_for_get_name_owner
>-tp_cli_dbus_daemon_callback_for_hello
>-tp_cli_dbus_daemon_callback_for_list_activatable_names
>-tp_cli_dbus_daemon_callback_for_list_names
>-tp_cli_dbus_daemon_callback_for_list_queued_owners
>-tp_cli_dbus_daemon_callback_for_name_has_owner
>-tp_cli_dbus_daemon_callback_for_release_name
>-tp_cli_dbus_daemon_callback_for_reload_config
>-tp_cli_dbus_daemon_callback_for_remove_match
>-tp_cli_dbus_daemon_callback_for_request_name
>-tp_cli_dbus_daemon_callback_for_start_service_by_name
>-tp_cli_dbus_daemon_connect_to_name_acquired
>-tp_cli_dbus_daemon_connect_to_name_lost
>-tp_cli_dbus_daemon_connect_to_name_owner_changed
>-tp_cli_dbus_daemon_signal_callback_name_acquired
>-tp_cli_dbus_daemon_signal_callback_name_lost
>-tp_cli_dbus_daemon_signal_callback_name_owner_changed
> <SUBSECTION Standard>
> tp_dbus_name_type_get_type
> tp_dbus_daemon_get_type
>@@ -2923,7 +2884,7 @@ TpProxyFeaturePrivate
> <SECTION>
> <FILE>proxy-dbus-core</FILE>
> <TITLE>proxy-dbus-core</TITLE>
>-<INCLUDE>telepathy-glib/proxy.h</INCLUDE>
>+<INCLUDE>telepathy-glib/cli-misc.h</INCLUDE>
> <SUBSECTION>
> tp_cli_dbus_introspectable_call_introspect
> tp_cli_dbus_introspectable_callback_for_introspect
>@@ -2939,6 +2900,45 @@ tp_cli_dbus_properties_callback_for_get_all
> tp_cli_dbus_properties_callback_for_set
> tp_cli_dbus_properties_signal_callback_properties_changed
> tp_cli_dbus_properties_connect_to_properties_changed
>+<SUBSECTION>
>+tp_cli_dbus_daemon_call_add_match
>+tp_cli_dbus_daemon_call_get_connection_se_linux_security_context
>+tp_cli_dbus_daemon_call_get_connection_unix_process_id
>+tp_cli_dbus_daemon_call_get_connection_unix_user
>+tp_cli_dbus_daemon_call_get_id
>+tp_cli_dbus_daemon_call_get_name_owner
>+tp_cli_dbus_daemon_call_hello
>+tp_cli_dbus_daemon_call_list_activatable_names
>+tp_cli_dbus_daemon_call_list_names
>+tp_cli_dbus_daemon_call_list_queued_owners
>+tp_cli_dbus_daemon_call_name_has_owner
>+tp_cli_dbus_daemon_call_release_name
>+tp_cli_dbus_daemon_call_reload_config
>+tp_cli_dbus_daemon_call_remove_match
>+tp_cli_dbus_daemon_call_request_name
>+tp_cli_dbus_daemon_call_start_service_by_name
>+tp_cli_dbus_daemon_callback_for_add_match
>+tp_cli_dbus_daemon_callback_for_get_connection_se_linux_security_context
>+tp_cli_dbus_daemon_callback_for_get_connection_unix_process_id
>+tp_cli_dbus_daemon_callback_for_get_connection_unix_user
>+tp_cli_dbus_daemon_callback_for_get_id
>+tp_cli_dbus_daemon_callback_for_get_name_owner
>+tp_cli_dbus_daemon_callback_for_hello
>+tp_cli_dbus_daemon_callback_for_list_activatable_names
>+tp_cli_dbus_daemon_callback_for_list_names
>+tp_cli_dbus_daemon_callback_for_list_queued_owners
>+tp_cli_dbus_daemon_callback_for_name_has_owner
>+tp_cli_dbus_daemon_callback_for_release_name
>+tp_cli_dbus_daemon_callback_for_reload_config
>+tp_cli_dbus_daemon_callback_for_remove_match
>+tp_cli_dbus_daemon_callback_for_request_name
>+tp_cli_dbus_daemon_callback_for_start_service_by_name
>+tp_cli_dbus_daemon_connect_to_name_acquired
>+tp_cli_dbus_daemon_connect_to_name_lost
>+tp_cli_dbus_daemon_connect_to_name_owner_changed
>+tp_cli_dbus_daemon_signal_callback_name_acquired
>+tp_cli_dbus_daemon_signal_callback_name_lost
>+tp_cli_dbus_daemon_signal_callback_name_owner_changed
> </SECTION>
> 
> <SECTION>
>diff --git a/examples/client/inspect-connection.c b/examples/client/inspect-connection.c
>index e11af95..a0a61d3 100644
>--- a/examples/client/inspect-connection.c
>+++ b/examples/client/inspect-connection.c
>@@ -14,6 +14,7 @@
> #include <stdio.h>
> 
> #include <telepathy-glib/telepathy-glib.h>
>+#include <telepathy-glib/cli-misc.h>
> 
> static int exit_status = 1;
> 
>diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
>index b60e2ca..0747cbc 100644
>--- a/telepathy-glib/Makefile.am
>+++ b/telepathy-glib/Makefile.am
>@@ -70,6 +70,7 @@ our_headers = \
>     channel-dispatch-operation.h \
>     channel-manager.h \
>     channel-request.h \
>+    cli-misc.h \
>     client.h \
>     client-channel-factory.h \
>     client-message.h \
>diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
>index 2584116..ec4d52d 100644
>--- a/telepathy-glib/account-manager.c
>+++ b/telepathy-glib/account-manager.c
>@@ -24,6 +24,7 @@
> #include "telepathy-glib/account-manager-internal.h"
> #include "telepathy-glib/account-internal.h"
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/defs.h>
> #include <telepathy-glib/gtypes.h>
> #include <telepathy-glib/interfaces.h>
>diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
>index 456876f..a54aa62 100644
>--- a/telepathy-glib/account.c
>+++ b/telepathy-glib/account.c
>@@ -26,6 +26,7 @@
> #include "telepathy-glib/account-internal.h"
> #include "telepathy-glib/account.h"
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/defs.h>
> #include <telepathy-glib/errors.h>
>diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c
>index d722f84..1df0c7c 100644
>--- a/telepathy-glib/call-channel.c
>+++ b/telepathy-glib/call-channel.c
>@@ -52,6 +52,7 @@
> #include <telepathy-glib/call-content.h>
> #include <telepathy-glib/call-misc.h>
> #include <telepathy-glib/call-stream.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/gtypes.h>
> #include <telepathy-glib/interfaces.h>
>diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c
>index 8ad6114..7827272 100644
>--- a/telepathy-glib/call-content.c
>+++ b/telepathy-glib/call-content.c
>@@ -49,6 +49,7 @@
> 
> #include <telepathy-glib/call-misc.h>
> #include <telepathy-glib/call-stream.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/dtmf.h>
> #include <telepathy-glib/enums.h>
>diff --git a/telepathy-glib/call-stream.c b/telepathy-glib/call-stream.c
>index 198b53a..06bba2f 100644
>--- a/telepathy-glib/call-stream.c
>+++ b/telepathy-glib/call-stream.c
>@@ -48,6 +48,7 @@
> #include "telepathy-glib/call-stream.h"
> 
> #include <telepathy-glib/call-misc.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/enums.h>
> #include <telepathy-glib/errors.h>
>diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c
>index 6534df0..fc367f7 100644
>--- a/telepathy-glib/channel-dispatch-operation.c
>+++ b/telepathy-glib/channel-dispatch-operation.c
>@@ -26,6 +26,7 @@
> 
> #include <telepathy-glib/base-client-internal.h>
> #include <telepathy-glib/channel.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/defs.h>
> #include <telepathy-glib/errors.h>
> #include <telepathy-glib/gtypes.h>
>diff --git a/telepathy-glib/channel-group.c b/telepathy-glib/channel-group.c
>index 913227d..71b13db 100644
>--- a/telepathy-glib/channel-group.c
>+++ b/telepathy-glib/channel-group.c
>@@ -23,6 +23,7 @@
> 
> #include "telepathy-glib/channel-internal.h"
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/gtypes.h>
> #include <telepathy-glib/interfaces.h>
>diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
>index b056318..1c10145 100644
>--- a/telepathy-glib/channel.c
>+++ b/telepathy-glib/channel.c
>@@ -24,6 +24,7 @@
> #include "telepathy-glib/channel-internal.h"
> 
> #include <telepathy-glib/channel-iface.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/gtypes.h>
> #include <telepathy-glib/interfaces.h>
>diff --git a/telepathy-glib/cli-misc.h b/telepathy-glib/cli-misc.h
>new file mode 100644
>index 0000000..e20685d
>--- /dev/null
>+++ b/telepathy-glib/cli-misc.h
>@@ -0,0 +1,31 @@
>+/*
>+ * cli-misc.h - auto-generated methods for "small" classes
>+ *
>+ * Copyright Â© 2007-2012 Collabora Ltd. <http://www.collabora.co.uk/>
>+ * Copyright Â© 2007 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_GLIB_CLI_MISC_H
>+#define TELEPATHY_GLIB_CLI_MISC_H
>+
>+#include <telepathy-glib/proxy.h>
>+
>+#include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
>+#include <telepathy-glib/_gen/tp-cli-generic.h>
>+
>+#endif
>+
>diff --git a/telepathy-glib/connection-avatars.c b/telepathy-glib/connection-avatars.c
>index 7c590f4..a0df513 100644
>--- a/telepathy-glib/connection-avatars.c
>+++ b/telepathy-glib/connection-avatars.c
>@@ -23,6 +23,7 @@
> 
> #include "telepathy-glib/connection.h"
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/interfaces.h>
> 
>diff --git a/telepathy-glib/connection-contact-info.c b/telepathy-glib/connection-contact-info.c
>index c1b0ba8..ea0a427 100644
>--- a/telepathy-glib/connection-contact-info.c
>+++ b/telepathy-glib/connection-contact-info.c
>@@ -26,6 +26,7 @@
> 
> #include <dbus/dbus-protocol.h>
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/gtypes.h>
> #include <telepathy-glib/interfaces.h>
>diff --git a/telepathy-glib/connection-contact-list.c b/telepathy-glib/connection-contact-list.c
>index 148a627..b3e0f01 100644
>--- a/telepathy-glib/connection-contact-list.c
>+++ b/telepathy-glib/connection-contact-list.c
>@@ -22,6 +22,7 @@
> 
> #include "telepathy-glib/connection-contact-list.h"
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/interfaces.h>
> #include <telepathy-glib/simple-client-factory.h>
>diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
>index 27c89bf..3bcd5a8 100644
>--- a/telepathy-glib/connection-manager.c
>+++ b/telepathy-glib/connection-manager.c
>@@ -25,6 +25,7 @@
> 
> #include <string.h>
> 
>+#include <telepathy-glib/cli-misc.h>
> #include "telepathy-glib/defs.h"
> #include "telepathy-glib/enums.h"
> #include "telepathy-glib/errors.h"
>diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
>index 851db5d..818d275 100644
>--- a/telepathy-glib/connection.c
>+++ b/telepathy-glib/connection.c
>@@ -27,6 +27,7 @@
> 
> #include <dbus/dbus-protocol.h>
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/connection-manager.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/defs.h>
>diff --git a/telepathy-glib/dbus-daemon.c b/telepathy-glib/dbus-daemon.c
>index 478ff3b..38fc748 100644
>--- a/telepathy-glib/dbus-daemon.c
>+++ b/telepathy-glib/dbus-daemon.c
>@@ -27,6 +27,7 @@
> #include <dbus/dbus.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/errors.h>
> #include <telepathy-glib/interfaces.h>
> #include <telepathy-glib/proxy-subclass.h>
>diff --git a/telepathy-glib/dbus-daemon.h b/telepathy-glib/dbus-daemon.h
>index 0ec7d9e..07aec71 100644
>--- a/telepathy-glib/dbus-daemon.h
>+++ b/telepathy-glib/dbus-daemon.h
>@@ -93,6 +93,4 @@ void tp_dbus_daemon_unregister_object (TpDBusDaemon *self, gpointer object);
> 
> G_END_DECLS
> 
>-#include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
>-
> #endif
>diff --git a/telepathy-glib/file-transfer-channel.c b/telepathy-glib/file-transfer-channel.c
>index a046bd8..34cc49b 100644
>--- a/telepathy-glib/file-transfer-channel.c
>+++ b/telepathy-glib/file-transfer-channel.c
>@@ -98,6 +98,7 @@
> 
> #include "telepathy-glib/file-transfer-channel.h"
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/gnio-util.h>
> #include <telepathy-glib/gtypes.h>
>diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
>index e8996e9..3782e3b 100644
>--- a/telepathy-glib/proxy.c
>+++ b/telepathy-glib/proxy.c
>@@ -26,6 +26,7 @@
> 
> #include <string.h>
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/interfaces.h>
> #include <telepathy-glib/automatic-client-factory.h>
> #include <telepathy-glib/util.h>
>diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h
>index c170c4a..22bc426 100644
>--- a/telepathy-glib/proxy.h
>+++ b/telepathy-glib/proxy.h
>@@ -182,6 +182,4 @@ gboolean tp_proxy_prepare_finish (gpointer self,
> 
> G_END_DECLS
> 
>-#include <telepathy-glib/_gen/tp-cli-generic.h>
>-
> #endif /* #ifndef __TP_PROXY_H__*/
>diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
>index 46ab3d3..9f36fbb 100644
>--- a/telepathy-glib/text-channel.c
>+++ b/telepathy-glib/text-channel.c
>@@ -47,6 +47,7 @@
> 
> #include "telepathy-glib/text-channel.h"
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/contact.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/enums.h>
>diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c
>index 2d81d43..fa90db9 100644
>--- a/tests/dbus/base-client.c
>+++ b/tests/dbus/base-client.c
>@@ -14,6 +14,7 @@
> #include <telepathy-glib/account-manager.h>
> #include <telepathy-glib/add-dispatch-operation-context-internal.h>
> #include <telepathy-glib/base-client.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/client.h>
> #include <telepathy-glib/debug.h>
> #include <telepathy-glib/defs.h>
>diff --git a/tests/dbus/call-cancellation.c b/tests/dbus/call-cancellation.c
>index 04e9d89..8bd37ec 100644
>--- a/tests/dbus/call-cancellation.c
>+++ b/tests/dbus/call-cancellation.c
>@@ -1,5 +1,6 @@
> #include "config.h"
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/debug.h>
> #include <telepathy-glib/errors.h>
>diff --git a/tests/dbus/call-channel.c b/tests/dbus/call-channel.c
>index 4c88fc1..1df101e 100644
>--- a/tests/dbus/call-channel.c
>+++ b/tests/dbus/call-channel.c
>@@ -18,6 +18,7 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/telepathy-glib.h>
> #include <telepathy-glib/proxy-subclass.h>
> 
>diff --git a/tests/dbus/disconnection.c b/tests/dbus/disconnection.c
>index b736cac..2ebab71 100644
>--- a/tests/dbus/disconnection.c
>+++ b/tests/dbus/disconnection.c
>@@ -1,5 +1,6 @@
> #include "config.h"
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/debug.h>
> #include <telepathy-glib/errors.h>
>diff --git a/tests/dbus/properties.c b/tests/dbus/properties.c
>index caf8eb8..eb94bf2 100644
>--- a/tests/dbus/properties.c
>+++ b/tests/dbus/properties.c
>@@ -5,6 +5,7 @@
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus.h>
> #include <telepathy-glib/dbus-properties-mixin.h>
> #include <telepathy-glib/debug.h>
>diff --git a/tests/dbus/simple-approver.c b/tests/dbus/simple-approver.c
>index fec5b6a..99e4daf 100644
>--- a/tests/dbus/simple-approver.c
>+++ b/tests/dbus/simple-approver.c
>@@ -10,6 +10,7 @@
> #include "config.h"
> 
> #include <telepathy-glib/simple-approver.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/client.h>
> #include <telepathy-glib/debug.h>
> #include <telepathy-glib/defs.h>
>diff --git a/tests/dbus/simple-handler.c b/tests/dbus/simple-handler.c
>index 00594d1..b44a119 100644
>--- a/tests/dbus/simple-handler.c
>+++ b/tests/dbus/simple-handler.c
>@@ -10,6 +10,7 @@
> #include "config.h"
> 
> #include <telepathy-glib/simple-handler.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/client.h>
> #include <telepathy-glib/debug.h>
> #include <telepathy-glib/defs.h>
>diff --git a/tests/dbus/simple-observer.c b/tests/dbus/simple-observer.c
>index 4fdc39e..69e0943 100644
>--- a/tests/dbus/simple-observer.c
>+++ b/tests/dbus/simple-observer.c
>@@ -10,6 +10,7 @@
> #include "config.h"
> 
> #include <telepathy-glib/simple-observer.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/client.h>
> #include <telepathy-glib/debug.h>
> #include <telepathy-glib/defs.h>
>diff --git a/tests/lib/util.c b/tests/lib/util.c
>index f758b4f..c0d3332 100644
>--- a/tests/lib/util.c
>+++ b/tests/lib/util.c
>@@ -12,6 +12,7 @@
> 
> #include "tests/lib/util.h"
> 
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/connection.h>
> 
> #include <glib/gstdio.h>
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 46835: 57868 | 58069 | 58070 | 58071 | 58072 | 58073 | 58074 | 58075 | 58076 | 58077 | 58078 | 58079 | 58080 | 58081 | 58082 | 60692 | 60693 | 60694 | 60695 | 60696 | 60697 | 60801

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.