Attachment 58080 Details for Bug 46835 – [next 08/10] Move client code for TpChannelDispatcher and its children to cli-misc.h

[patch] [next 08/10] Move client code for TpChannelDispatcher and its children to cli-misc.h

0008-Move-client-code-for-TpChannelDispatcher-and-its-chi.patch (text/plain), 9.29 KB, created by Simon McVittie on 2012-03-06 11:28:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-03-06 11:28:56 UTC

Size: 9.29 KB

patch

obsolete

>From 88b41579bc56668af87c38d94bf12a9309e55919 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 6 Mar 2012 19:02:30 +0000
>Subject: [PATCH 08/10] Move client code for TpChannelDispatcher and its
> children to cli-misc.h
>
>---
> docs/reference/telepathy-glib-docs.sgml     |    1 +
> docs/reference/telepathy-glib-sections.txt  |   66 +++++++++++++++------------
> telepathy-glib/account-channel-request.c    |    1 +
> telepathy-glib/base-client.c                |    1 +
> telepathy-glib/channel-dispatch-operation.h |    2 -
> telepathy-glib/channel-dispatcher.c         |    1 +
> telepathy-glib/channel-dispatcher.h         |    2 -
> telepathy-glib/channel-request.c            |    1 +
> telepathy-glib/channel-request.h            |    2 -
> telepathy-glib/cli-misc.h                   |    6 +++
> 10 files changed, 47 insertions(+), 36 deletions(-)
>
>diff --git a/docs/reference/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib-docs.sgml
>index a8335c2..cfcfc85 100644
>--- a/docs/reference/telepathy-glib-docs.sgml
>+++ b/docs/reference/telepathy-glib-docs.sgml
>@@ -79,6 +79,7 @@
>     <xi:include href="xml/channel-dispatcher.xml"/>
>     <xi:include href="xml/channel-dispatch-operation.xml"/>
>     <xi:include href="xml/channel-request.xml"/>
>+    <xi:include href="xml/cli-channel-dispatcher.xml"/>
>     <xi:include href="xml/client.xml"/>
>     <xi:include href="xml/account-channel-request.xml"/>
>     <xi:include href="xml/stream-tube-channel.xml"/>
>diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
>index 9e9410e..f7d3d30 100644
>--- a/docs/reference/telepathy-glib-sections.txt
>+++ b/docs/reference/telepathy-glib-sections.txt
>@@ -4065,7 +4065,22 @@ TpChannelDispatcher
> TpChannelDispatcherClass
> tp_channel_dispatcher_new
> tp_channel_dispatcher_init_known_interfaces
>-<SUBSECTION>
>+<SUBSECTION Standard>
>+TP_CHANNEL_DISPATCHER
>+TP_IS_CHANNEL_DISPATCHER
>+TP_IS_CHANNEL_DISPATCHER_CLASS
>+TP_TYPE_CHANNEL_DISPATCHER
>+tp_channel_dispatcher_get_type
>+TP_CHANNEL_DISPATCHER_CLASS
>+TP_CHANNEL_DISPATCHER_GET_CLASS
>+TpChannelDispatcherPrivate
>+TpChannelDispatcherClassPrivate
>+</SECTION>
>+
>+<SECTION>
>+<FILE>cli-channel-dispatcher</FILE>
>+<INCLUDE>telepathy-glib/cli-misc.h</INCLUDE>
>+<TITLE>cli-channel-dispatcher</TITLE>
> tp_cli_channel_dispatcher_callback_for_create_channel
> tp_cli_channel_dispatcher_call_create_channel
> tp_cli_channel_dispatcher_callback_for_ensure_channel
>@@ -4079,16 +4094,26 @@ tp_cli_channel_dispatcher_interface_operation_list_signal_callback_dispatch_oper
> tp_cli_channel_dispatcher_interface_operation_list_connect_to_dispatch_operation_finished
> tp_cli_channel_dispatcher_interface_operation_list_signal_callback_new_dispatch_operation
> tp_cli_channel_dispatcher_interface_operation_list_connect_to_new_dispatch_operation
>-<SUBSECTION Standard>
>-TP_CHANNEL_DISPATCHER
>-TP_IS_CHANNEL_DISPATCHER
>-TP_IS_CHANNEL_DISPATCHER_CLASS
>-TP_TYPE_CHANNEL_DISPATCHER
>-tp_channel_dispatcher_get_type
>-TP_CHANNEL_DISPATCHER_CLASS
>-TP_CHANNEL_DISPATCHER_GET_CLASS
>-TpChannelDispatcherPrivate
>-TpChannelDispatcherClassPrivate
>+<SUBSECTION>
>+tp_cli_channel_request_callback_for_cancel
>+tp_cli_channel_request_call_cancel
>+tp_cli_channel_request_callback_for_proceed
>+tp_cli_channel_request_call_proceed
>+tp_cli_channel_request_signal_callback_failed
>+tp_cli_channel_request_connect_to_failed
>+tp_cli_channel_request_signal_callback_succeeded
>+tp_cli_channel_request_connect_to_succeeded
>+<SUBSECTION>
>+tp_cli_channel_dispatch_operation_callback_for_claim
>+tp_cli_channel_dispatch_operation_call_claim
>+tp_cli_channel_dispatch_operation_callback_for_handle_with
>+tp_cli_channel_dispatch_operation_call_handle_with
>+tp_cli_channel_dispatch_operation_callback_for_handle_with_time
>+tp_cli_channel_dispatch_operation_call_handle_with_time
>+tp_cli_channel_dispatch_operation_signal_callback_channel_lost
>+tp_cli_channel_dispatch_operation_connect_to_channel_lost
>+tp_cli_channel_dispatch_operation_signal_callback_finished
>+tp_cli_channel_dispatch_operation_connect_to_finished
> </SECTION>
> 
> <SECTION>
>@@ -4136,16 +4161,6 @@ TpChannelDispatchOperationClass
> tp_channel_dispatch_operation_new
> tp_channel_dispatch_operation_init_known_interfaces
> <SUBSECTION>
>-tp_cli_channel_dispatch_operation_callback_for_claim
>-tp_cli_channel_dispatch_operation_call_claim
>-tp_cli_channel_dispatch_operation_callback_for_handle_with
>-tp_cli_channel_dispatch_operation_call_handle_with
>-tp_cli_channel_dispatch_operation_callback_for_handle_with_time
>-tp_cli_channel_dispatch_operation_call_handle_with_time
>-tp_cli_channel_dispatch_operation_signal_callback_channel_lost
>-tp_cli_channel_dispatch_operation_connect_to_channel_lost
>-tp_cli_channel_dispatch_operation_signal_callback_finished
>-tp_cli_channel_dispatch_operation_connect_to_finished
> TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE
> tp_channel_dispatch_operation_borrow_account
> tp_channel_dispatch_operation_borrow_channels
>@@ -4192,15 +4207,6 @@ tp_channel_request_get_account
> tp_channel_request_get_user_action_time
> tp_channel_request_get_preferred_handler
> tp_channel_request_get_hints
>-<SUBSECTION>
>-tp_cli_channel_request_callback_for_cancel
>-tp_cli_channel_request_call_cancel
>-tp_cli_channel_request_callback_for_proceed
>-tp_cli_channel_request_call_proceed
>-tp_cli_channel_request_signal_callback_failed
>-tp_cli_channel_request_connect_to_failed
>-tp_cli_channel_request_signal_callback_succeeded
>-tp_cli_channel_request_connect_to_succeeded
> <SUBSECTION Standard>
> TP_CHANNEL_REQUEST
> TP_CHANNEL_REQUEST_CLASS
>diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
>index cb4a6fc..7c5cbd2 100644
>--- a/telepathy-glib/account-channel-request.c
>+++ b/telepathy-glib/account-channel-request.c
>@@ -78,6 +78,7 @@
> #include <telepathy-glib/channel-dispatcher.h>
> #include <telepathy-glib/channel-request.h>
> #include <telepathy-glib/channel.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/gtypes.h>
> #include <telepathy-glib/simple-handler.h>
> #include <telepathy-glib/util.h>
>diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
>index 5959dd1..a8a9a38 100644
>--- a/telepathy-glib/base-client.c
>+++ b/telepathy-glib/base-client.c
>@@ -190,6 +190,7 @@
> #include <telepathy-glib/channel-dispatcher.h>
> #include <telepathy-glib/channel-request.h>
> #include <telepathy-glib/channel.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/dbus-internal.h>
> #include <telepathy-glib/handle-channels-context-internal.h>
> #include <telepathy-glib/interfaces.h>
>diff --git a/telepathy-glib/channel-dispatch-operation.h b/telepathy-glib/channel-dispatch-operation.h
>index 3efcc60..c38d466 100644
>--- a/telepathy-glib/channel-dispatch-operation.h
>+++ b/telepathy-glib/channel-dispatch-operation.h
>@@ -178,6 +178,4 @@ gboolean tp_channel_dispatch_operation_destroy_channels_finish (
> 
> G_END_DECLS
> 
>-#include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h>
>-
> #endif
>diff --git a/telepathy-glib/channel-dispatcher.c b/telepathy-glib/channel-dispatcher.c
>index 3132589..52fe839 100644
>--- a/telepathy-glib/channel-dispatcher.c
>+++ b/telepathy-glib/channel-dispatcher.c
>@@ -23,6 +23,7 @@
> 
> #include "telepathy-glib/channel-dispatcher.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/channel-dispatcher.h b/telepathy-glib/channel-dispatcher.h
>index dc16548..8d78dad 100644
>--- a/telepathy-glib/channel-dispatcher.h
>+++ b/telepathy-glib/channel-dispatcher.h
>@@ -84,6 +84,4 @@ gboolean tp_channel_dispatcher_present_channel_finish (
> 
> G_END_DECLS
> 
>-#include <telepathy-glib/_gen/tp-cli-channel-dispatcher.h>
>-
> #endif
>diff --git a/telepathy-glib/channel-request.c b/telepathy-glib/channel-request.c
>index 4e002cf..e31354e 100644
>--- a/telepathy-glib/channel-request.c
>+++ b/telepathy-glib/channel-request.c
>@@ -26,6 +26,7 @@
> #include <telepathy-glib/account-manager.h>
> #include <telepathy-glib/automatic-proxy-factory.h>
> #include <telepathy-glib/channel.h>
>+#include <telepathy-glib/cli-misc.h>
> #include <telepathy-glib/connection.h>
> #include <telepathy-glib/defs.h>
> #include <telepathy-glib/errors.h>
>diff --git a/telepathy-glib/channel-request.h b/telepathy-glib/channel-request.h
>index c3f0b76..7f0cd0b 100644
>--- a/telepathy-glib/channel-request.h
>+++ b/telepathy-glib/channel-request.h
>@@ -88,6 +88,4 @@ const GHashTable * tp_channel_request_get_hints (TpChannelRequest *self);
> 
> G_END_DECLS
> 
>-#include <telepathy-glib/_gen/tp-cli-channel-request.h>
>-
> #endif
>diff --git a/telepathy-glib/cli-misc.h b/telepathy-glib/cli-misc.h
>index e7417bb..56b87f0 100644
>--- a/telepathy-glib/cli-misc.h
>+++ b/telepathy-glib/cli-misc.h
>@@ -22,10 +22,16 @@
> #ifndef TELEPATHY_GLIB_CLI_MISC_H
> #define TELEPATHY_GLIB_CLI_MISC_H
> 
>+#include <telepathy-glib/channel-dispatcher.h>
>+#include <telepathy-glib/channel-dispatch-operation.h>
>+#include <telepathy-glib/channel-request.h>
> #include <telepathy-glib/connection-manager.h>
> #include <telepathy-glib/protocol.h>
> #include <telepathy-glib/proxy.h>
> 
>+#include <telepathy-glib/_gen/tp-cli-channel-dispatcher.h>
>+#include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h>
>+#include <telepathy-glib/_gen/tp-cli-channel-request.h>
> #include <telepathy-glib/_gen/tp-cli-connection-manager.h>
> #include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
> #include <telepathy-glib/_gen/tp-cli-generic.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.