From 751c9f929ff800b32f85dc488536a812937e04a1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 6 Mar 2012 19:11:07 +0000 Subject: [PATCH 10/10] Move Call generated code to cli-call.h --- docs/reference/telepathy-glib-sections.txt | 6 ++-- telepathy-glib/Makefile.am | 1 + telepathy-glib/call-content.c | 1 + telepathy-glib/call-content.h | 2 - telepathy-glib/call-misc.c | 1 + telepathy-glib/call-misc.h | 3 -- telepathy-glib/call-stream.c | 1 + telepathy-glib/call-stream.h | 2 - telepathy-glib/cli-call.h | 35 ++++++++++++++++++++++++++++ tests/dbus/call-channel.c | 1 + 10 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 telepathy-glib/cli-call.h diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt index be9df8f..f314eaf 100644 --- a/docs/reference/telepathy-glib-sections.txt +++ b/docs/reference/telepathy-glib-sections.txt @@ -5438,7 +5438,7 @@ tp_call_channel_get_feature_quark_core
cli-call-content cli-call-content -telepathy-glib/call-content.h +telepathy-glib/cli-call.h tp_cli_call_content_call_remove tp_cli_call_content_callback_for_remove @@ -5531,7 +5531,7 @@ tp_call_content_get_feature_quark_core
cli-call-stream cli-call-stream -telepathy-glib/call-stream.h +telepathy-glib/cli-call.h tp_cli_call_stream_call_request_receiving tp_cli_call_stream_call_set_sending @@ -5611,7 +5611,7 @@ tp_call_stream_get_feature_quark_core
cli-call-misc cli-call-misc -telepathy-glib/call-misc.h +telepathy-glib/cli-call.h tp_cli_call_content_media_description_call_accept tp_cli_call_content_media_description_call_reject tp_cli_call_content_media_description_callback_for_accept diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am index 6b8a0d1..710fbe1 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-call.h \ cli-channel.h \ cli-connection.h \ cli-misc.h \ diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c index 7827272..1292132 100644 --- a/telepathy-glib/call-content.c +++ b/telepathy-glib/call-content.c @@ -49,6 +49,7 @@ #include #include +#include #include #include #include diff --git a/telepathy-glib/call-content.h b/telepathy-glib/call-content.h index b490e0d..0888051 100644 --- a/telepathy-glib/call-content.h +++ b/telepathy-glib/call-content.h @@ -82,6 +82,4 @@ gboolean tp_call_content_send_tones_finish (TpCallContent *self, G_END_DECLS -#include - #endif diff --git a/telepathy-glib/call-misc.c b/telepathy-glib/call-misc.c index 5d16f3d..22c5bee 100644 --- a/telepathy-glib/call-misc.c +++ b/telepathy-glib/call-misc.c @@ -31,6 +31,7 @@ #include "config.h" #include "telepathy-glib/call-misc.h" +#include "telepathy-glib/cli-call.h" #include "telepathy-glib/errors.h" #include "telepathy-glib/interfaces.h" #include "telepathy-glib/proxy-subclass.h" diff --git a/telepathy-glib/call-misc.h b/telepathy-glib/call-misc.h index 44dfa09..7e3922a 100644 --- a/telepathy-glib/call-misc.h +++ b/telepathy-glib/call-misc.h @@ -30,7 +30,4 @@ void tp_call_content_media_description_init_known_interfaces (void); G_END_DECLS -#include -#include - #endif diff --git a/telepathy-glib/call-stream.c b/telepathy-glib/call-stream.c index 06bba2f..7d2627d 100644 --- a/telepathy-glib/call-stream.c +++ b/telepathy-glib/call-stream.c @@ -48,6 +48,7 @@ #include "telepathy-glib/call-stream.h" #include +#include #include #include #include diff --git a/telepathy-glib/call-stream.h b/telepathy-glib/call-stream.h index 9c34032..7039080 100644 --- a/telepathy-glib/call-stream.h +++ b/telepathy-glib/call-stream.h @@ -82,6 +82,4 @@ gboolean tp_call_stream_request_receiving_finish (TpCallStream *self, G_END_DECLS -#include - #endif diff --git a/telepathy-glib/cli-call.h b/telepathy-glib/cli-call.h new file mode 100644 index 0000000..d611564 --- /dev/null +++ b/telepathy-glib/cli-call.h @@ -0,0 +1,35 @@ +/* + * cli-call.h - auto-generated methods for Call classes + * + * Copyright © 2007-2012 Collabora Ltd. + * 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_CALL_H +#define TELEPATHY_GLIB_CLI_CALL_H + +#include +#include +#include + +#include +#include +#include +#include + +#endif + diff --git a/tests/dbus/call-channel.c b/tests/dbus/call-channel.c index 47ec35d..528912e 100644 --- a/tests/dbus/call-channel.c +++ b/tests/dbus/call-channel.c @@ -19,6 +19,7 @@ */ #include +#include #include #include #include -- 1.7.9.1