diff options
-rw-r--r-- | docs/reference/ytstenut/Makefile.am | 3 | ||||
-rw-r--r-- | ytstenut/Makefile.am | 5 | ||||
-rw-r--r-- | ytstenut/yts-client.c | 1 | ||||
-rw-r--r-- | ytstenut/yts-contact-internal.h | 40 | ||||
-rw-r--r-- | ytstenut/yts-contact.c | 8 | ||||
-rw-r--r-- | ytstenut/yts-contact.h | 14 | ||||
-rw-r--r-- | ytstenut/yts-proxy-internal.h | 37 | ||||
-rw-r--r-- | ytstenut/yts-proxy-service-internal.h | 39 | ||||
-rw-r--r-- | ytstenut/yts-proxy-service.c | 3 | ||||
-rw-r--r-- | ytstenut/yts-proxy-service.h | 14 | ||||
-rw-r--r-- | ytstenut/yts-proxy.h | 12 |
11 files changed, 130 insertions, 46 deletions
diff --git a/docs/reference/ytstenut/Makefile.am b/docs/reference/ytstenut/Makefile.am index 85a537c..737254d 100644 --- a/docs/reference/ytstenut/Makefile.am +++ b/docs/reference/ytstenut/Makefile.am @@ -56,6 +56,7 @@ EXTRA_HFILES= # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h IGNORE_HFILES= \ empathy-tp-file.h \ + yts-contact-internal.h \ yts-enum-types.h \ yts-marshal.h \ yts-private.h \ @@ -63,6 +64,8 @@ IGNORE_HFILES= \ yts-profile-proxy.h \ yts-profile-adapter.h \ yts-profile-impl.h \ + yts-proxy-internal.h \ + yts-proxy-service-internal.h \ yts-vp-playable-proxy.h \ yts-vp-player-adapter.h \ yts-vp-player-proxy.h \ diff --git a/ytstenut/Makefile.am b/ytstenut/Makefile.am index 60d4861..0d9d7e7 100644 --- a/ytstenut/Makefile.am +++ b/ytstenut/Makefile.am @@ -79,7 +79,7 @@ source_c = \ $(srcdir)/profile/yts-profile-impl.c \ $(srcdir)/profile/yts-profile-proxy.c \ $(srcdir)/profile/yts-profile-adapter.c \ - \ + \ $(srcdir)/video-profile/yts-vp-content.c \ $(srcdir)/video-profile/yts-vp-playable.c \ $(srcdir)/video-profile/yts-vp-playable-proxy.c \ @@ -97,10 +97,13 @@ source_c = \ private_h = \ $(srcdir)/yts-private.h \ \ + $(srcdir)/yts-contact-internal.h \ $(srcdir)/profile/yts-profile.h \ $(srcdir)/profile/yts-profile-impl.h \ $(srcdir)/profile/yts-profile-proxy.h \ $(srcdir)/profile/yts-profile-adapter.h \ + $(srcdir)/yts-proxy-internal.h \ + $(srcdir)/yts-proxy-service-internal.h \ \ $(srcdir)/video-profile/yts-vp-playable-proxy.h \ $(srcdir)/video-profile/yts-vp-player-adapter.h \ diff --git a/ytstenut/yts-client.c b/ytstenut/yts-client.c index 0308d79..3174726 100644 --- a/ytstenut/yts-client.c +++ b/ytstenut/yts-client.c @@ -43,6 +43,7 @@ #include <telepathy-ytstenut-glib/telepathy-ytstenut-glib.h> #include "yts-client.h" +#include "yts-contact-internal.h" #include "yts-debug.h" #include "yts-enum-types.h" #include "yts-error.h" diff --git a/ytstenut/yts-contact-internal.h b/ytstenut/yts-contact-internal.h new file mode 100644 index 0000000..5c69d88 --- /dev/null +++ b/ytstenut/yts-contact-internal.h @@ -0,0 +1,40 @@ +/* + * Copyright © 2011 Intel Corp. + * + * 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 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, see + * <http://www.gnu.org/licenses/>. + * + * Authored by: Rob Staudinger <robsta@linux.intel.com> + */ + +#ifndef YTS_CONTACT_INTERNAL_H +#define YTS_CONTACT_INTERNAL_H + +#include <stdbool.h> +#include <ytstenut/yts-contact.h> + +bool +yts_contact_dispatch_event (YtsContact *self, + char const *capability, + char const *aspect, + GVariant *arguments); + +bool +yts_contact_dispatch_response (YtsContact *self, + char const *capability, + char const *invocation_id, + GVariant *response); + +#endif /* YTS_CONTACT_INTERNAL_H */ + diff --git a/ytstenut/yts-contact.c b/ytstenut/yts-contact.c index 71e6803..74e47df 100644 --- a/ytstenut/yts-contact.c +++ b/ytstenut/yts-contact.c @@ -37,13 +37,13 @@ #include <telepathy-glib/channel.h> #include "yts-client.h" -#include "yts-contact.h" +#include "yts-contact-internal.h" #include "yts-debug.h" #include "yts-enum-types.h" #include "yts-error.h" #include "yts-marshal.h" #include "yts-private.h" -#include "yts-proxy-service.h" +#include "yts-proxy-service-internal.h" #include "yts-types.h" #include "empathy-tp-file.h" @@ -1224,7 +1224,7 @@ _yts_contact_is_empty (YtsContact *contact) return (g_hash_table_size (priv->services) == 0); } -gboolean +bool yts_contact_dispatch_event (YtsContact *self, char const *capability, char const *aspect, @@ -1256,7 +1256,7 @@ yts_contact_dispatch_event (YtsContact *self, return dispatched; } -gboolean +bool yts_contact_dispatch_response (YtsContact *self, char const *capability, char const *invocation_id, diff --git a/ytstenut/yts-contact.h b/ytstenut/yts-contact.h index 188b7d5..13fc606 100644 --- a/ytstenut/yts-contact.h +++ b/ytstenut/yts-contact.h @@ -102,20 +102,6 @@ YtsError yts_contact_send_file (const YtsContact *item, gboolean yts_contact_cancel_file (const YtsContact *item, GFile *gfile); -/* FIXME private */ - -gboolean -yts_contact_dispatch_event (YtsContact *self, - char const *capability, - char const *aspect, - GVariant *arguments); - -gboolean -yts_contact_dispatch_response (YtsContact *self, - char const *capability, - char const *invocation_id, - GVariant *response); - G_END_DECLS #endif /* YTS_CONTACT_H */ diff --git a/ytstenut/yts-proxy-internal.h b/ytstenut/yts-proxy-internal.h new file mode 100644 index 0000000..8127696 --- /dev/null +++ b/ytstenut/yts-proxy-internal.h @@ -0,0 +1,37 @@ +/* + * Copyright © 2011 Intel Corp. + * + * 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 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, see + * <http://www.gnu.org/licenses/>. + * + * Authored by: Rob Staudinger <robsta@linux.intel.com> + */ + +#ifndef YTS_PROXY_INTERNAL_H +#define YTS_PROXY_INTERNAL_H + +#include <ytstenut/yts-proxy.h> + +void +yts_proxy_handle_service_event (YtsProxy *self, + char const *aspect, + GVariant *arguments); + +void +yts_proxy_handle_service_response (YtsProxy *self, + char const *invocation_id, + GVariant *response); + +#endif /* YTS_PROXY_INTERNAL_H */ + diff --git a/ytstenut/yts-proxy-service-internal.h b/ytstenut/yts-proxy-service-internal.h new file mode 100644 index 0000000..526b2bb --- /dev/null +++ b/ytstenut/yts-proxy-service-internal.h @@ -0,0 +1,39 @@ +/* + * Copyright © 2011 Intel Corp. + * + * 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 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, see + * <http://www.gnu.org/licenses/>. + * + * Authored by: Rob Staudinger <robsta@linux.intel.com> + */ + +#ifndef YTS_PROXY_SERVICE_INTERNAL_H +#define YTS_PROXY_SERVICE_INTERNAL_H + +#include <ytstenut/yts-proxy-service.h> + +bool +yts_proxy_service_dispatch_event (YtsProxyService *self, + char const *capability, + char const *aspect, + GVariant *arguments); + +bool +yts_proxy_service_dispatch_response (YtsProxyService *self, + char const *capability, + char const *invocation_id, + GVariant *response); + +#endif /* YTS_PROXY_SERVICE_INTERNAL_H */ + diff --git a/ytstenut/yts-proxy-service.c b/ytstenut/yts-proxy-service.c index 6bc006a..344c8ff 100644 --- a/ytstenut/yts-proxy-service.c +++ b/ytstenut/yts-proxy-service.c @@ -23,7 +23,8 @@ #include "yts-invocation-message.h" #include "yts-marshal.h" #include "yts-private.h" -#include "yts-proxy-service.h" +#include "yts-proxy-internal.h" +#include "yts-proxy-service-internal.h" #include "profile/yts-profile.h" #include "profile/yts-profile-proxy.h" diff --git a/ytstenut/yts-proxy-service.h b/ytstenut/yts-proxy-service.h index 6b137bc..0a950fe 100644 --- a/ytstenut/yts-proxy-service.h +++ b/ytstenut/yts-proxy-service.h @@ -67,20 +67,6 @@ bool yts_proxy_service_create_proxy (YtsProxyService *self, char const *capability); -/* FIXME private */ - -bool -yts_proxy_service_dispatch_event (YtsProxyService *self, - char const *capability, - char const *aspect, - GVariant *arguments); - -bool -yts_proxy_service_dispatch_response (YtsProxyService *self, - char const *capability, - char const *invocation_id, - GVariant *response); - G_END_DECLS #endif /* YTS_PROXY_SERVICE_H */ diff --git a/ytstenut/yts-proxy.h b/ytstenut/yts-proxy.h index 1fde207..967020d 100644 --- a/ytstenut/yts-proxy.h +++ b/ytstenut/yts-proxy.h @@ -79,18 +79,6 @@ yts_proxy_invoke (YtsProxy *self, char const *aspect, GVariant *arguments); -/* FIXME private */ - -void -yts_proxy_handle_service_event (YtsProxy *self, - char const *aspect, - GVariant *arguments); - -void -yts_proxy_handle_service_response (YtsProxy *self, - char const *invocation_id, - GVariant *response); - G_END_DECLS #endif /* YTS_PROXY_H */ |