diff options
author | Rob Staudinger <robsta@linux.intel.com> | 2012-02-01 10:04:37 +0100 |
---|---|---|
committer | Rob Staudinger <robsta@linux.intel.com> | 2012-02-01 10:04:37 +0100 |
commit | 513751a985d5591db1907ee8420120910bf39166 (patch) | |
tree | 893e0b2fa51417810368fc0ac3049b5c24c9a056 | |
parent | 37aca76dd9f0ade0db1870ae573e91f8766d336a (diff) |
docs: Clean up docs build, removing stale file references
Revisit the documentation build and remove references to the old
status implementation that has been superseded by commit
b004f03c6500e39021cee38f327507bb40af03c3.
Tags: docs
-rw-r--r-- | docs/reference/ytstenut/Makefile.am | 1 | ||||
-rw-r--r-- | docs/reference/ytstenut/ytstenut-docs.xml.in | 5 | ||||
-rw-r--r-- | tests/Makefile.am | 4 | ||||
-rw-r--r-- | tests/status.c | 91 | ||||
-rw-r--r-- | ytstenut/Makefile.am | 4 | ||||
-rw-r--r-- | ytstenut/yts-capability-status.c | 109 | ||||
-rw-r--r-- | ytstenut/yts-capability-status.h | 64 | ||||
-rw-r--r-- | ytstenut/yts-metadata.c | 59 | ||||
-rw-r--r-- | ytstenut/yts-status.c | 165 | ||||
-rw-r--r-- | ytstenut/yts-status.h | 84 | ||||
-rw-r--r-- | ytstenut/ytstenut.sym | 3 |
11 files changed, 5 insertions, 584 deletions
diff --git a/docs/reference/ytstenut/Makefile.am b/docs/reference/ytstenut/Makefile.am index bcc378d..dcd510f 100644 --- a/docs/reference/ytstenut/Makefile.am +++ b/docs/reference/ytstenut/Makefile.am @@ -82,7 +82,6 @@ IGNORE_HFILES = \ yts-service-factory.h \ yts-service-impl.h \ yts-service-internal.h \ - yts-status.h \ yts-vp-playable-proxy.h \ yts-vp-player-adapter.h \ yts-vp-player-proxy.h \ diff --git a/docs/reference/ytstenut/ytstenut-docs.xml.in b/docs/reference/ytstenut/ytstenut-docs.xml.in index 3a9cc2e..0de6dfc 100644 --- a/docs/reference/ytstenut/ytstenut-docs.xml.in +++ b/docs/reference/ytstenut/ytstenut-docs.xml.in @@ -48,15 +48,12 @@ <xi:include href="xml/yts-capability-status.xml"/> <xi:include href="xml/yts-capability.xml"/> - <xi:include href="xml/yts-caps.xml"/> <xi:include href="xml/yts-client.xml"/> <xi:include href="xml/yts-contact.xml"/> - <xi:include href="xml/yts-debug.xml"/> <xi:include href="xml/yts-error-message.xml"/> <xi:include href="xml/yts-error.xml"/> <xi:include href="xml/yts-event-message.xml"/> <xi:include href="xml/yts-invocation-message.xml"/> - <xi:include href="xml/yts-main.xml"/> <xi:include href="xml/yts-message.xml"/> <xi:include href="xml/yts-metadata-service.xml"/> <xi:include href="xml/yts-metadata.xml"/> @@ -66,8 +63,6 @@ <xi:include href="xml/yts-roster.xml"/> <xi:include href="xml/yts-service-adapter.xml"/> <xi:include href="xml/yts-service.xml"/> - <xi:include href="xml/yts-status.xml"/> - <xi:include href="xml/yts-types.xml"/> <xi:include href="xml/yts-version.xml"/> <xi:include href="xml/yts-vp-content.xml"/> <xi:include href="xml/yts-vp-playable.xml"/> diff --git a/tests/Makefile.am b/tests/Makefile.am index c230630..dad55d3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,6 @@ TESTS = \ message \ - status \ $(NULL) if ENABLE_INTEGRATION_TESTS @@ -26,9 +25,6 @@ check_PROGRAMS = $(TESTS) message_SOURCES = message.c message_LDADD = $(YTS_LIBS) -status_SOURCES = status.c -status_LDADD = $(YTS_LIBS) - ## File transfer can't be tested this way, because it is not possible to do ## FT to self (i.e., there would need to be two separate contacts, but as we ## only have one contact per device, that would mean two machines ... diff --git a/tests/status.c b/tests/status.c deleted file mode 100644 index fb4b46e..0000000 --- a/tests/status.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * 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: Tomas Frydrych <tf@linux.intel.com> - */ - -#include <ytstenut/ytstenut.h> -#include "ytstenut/yts-message.h" -#include "ytstenut/yts-status.h" - -int -main (int argc, char **argv) -{ - YtsStatus *status1, *status2; - YtsMessage *message; - const char *attrs[] = { - "capability", "urn:ytstenut:capabilities:yts-caps-video", - "activity", "yts-activity-playing", - "from-service", "org.freedesktop.ytstenut.TestStatus", - "a1", "v1", "a2", "v2", NULL}; - const char *a1, *a2, *a3; - RestXmlNode *top1, *top2, *child11, *child12, *child21, *child22; - - g_thread_init (NULL); - g_type_init (); - - status1 = yts_status_new (attrs); - - yts_metadata_add_attribute ((YtsMetadata*)status1, "a3", "v3"); - a1 = yts_metadata_get_attribute ((YtsMetadata*)status1, "a1"); - a2 = yts_metadata_get_attribute ((YtsMetadata*)status1, "a2"); - a3 = yts_metadata_get_attribute ((YtsMetadata*)status1, "a3"); - - g_assert_cmpstr (a1, ==, "v1"); - g_assert_cmpstr (a2, ==, "v2"); - g_assert_cmpstr (a3, ==, "v3"); - - status2 = yts_status_new (attrs); - - g_assert (!yts_metadata_is_equal ((YtsMetadata*)status1, - (YtsMetadata*)status2)); - - yts_metadata_add_attribute ((YtsMetadata*)status2, "a3", "v3"); - - g_assert (yts_metadata_is_equal ((YtsMetadata*)status1, - (YtsMetadata*)status2)); - - top1 = yts_metadata_get_root_node ((YtsMetadata*)status1); - top2 = yts_metadata_get_root_node ((YtsMetadata*)status2); - - child11 = rest_xml_node_add_child (top1, "t"); - child12 = rest_xml_node_add_child (top1, "t"); - - child21 = rest_xml_node_add_child (top2, "t"); - child22 = rest_xml_node_add_child (top2, "t"); - - g_assert (yts_metadata_is_equal ((YtsMetadata*)status1, - (YtsMetadata*)status2)); - - rest_xml_node_add_attr (child11, "a4", "v4"); - rest_xml_node_add_attr (child21, "a4", "v4"); - - g_assert (yts_metadata_is_equal ((YtsMetadata*)status1, - (YtsMetadata*)status2)); - - rest_xml_node_add_attr (child21, "a5", "v5"); - - g_assert (!yts_metadata_is_equal ((YtsMetadata*)status1, - (YtsMetadata*)status2)); - - message = yts_message_new (NULL); - - g_assert (!yts_metadata_is_equal ((YtsMetadata*)status1, - (YtsMetadata*)message)); - - return 0; -} diff --git a/ytstenut/Makefile.am b/ytstenut/Makefile.am index 9ec495b..de892cd 100644 --- a/ytstenut/Makefile.am +++ b/ytstenut/Makefile.am @@ -54,10 +54,8 @@ libsrc_la_SOURCES = \ $(srcdir)/yts-roster-impl.c \ $(srcdir)/yts-service.c \ $(srcdir)/yts-service-impl.c \ - $(srcdir)/yts-status.c \ \ $(srcdir)/yts-adapter-factory.c \ - $(srcdir)/yts-capability-status.c \ $(srcdir)/yts-error-message.c \ $(srcdir)/yts-event-message.c \ $(srcdir)/yts-factory.c \ @@ -116,14 +114,12 @@ libprv_la_SOURCES = \ $(srcdir)/yts-service-internal.h \ $(srcdir)/yts-xml.h \ \ - $(srcdir)/yts-capability-status.h \ $(srcdir)/yts-message.h \ $(srcdir)/yts-metadata.h \ $(srcdir)/yts-error-message.h \ $(srcdir)/yts-event-message.h \ $(srcdir)/yts-invocation-message.h \ $(srcdir)/yts-response-message.h \ - $(srcdir)/yts-status.h \ \ $(srcdir)/profile/yts-profile.h \ $(srcdir)/profile/yts-profile-impl.h \ diff --git a/ytstenut/yts-capability-status.c b/ytstenut/yts-capability-status.c deleted file mode 100644 index a2ed30f..0000000 --- a/ytstenut/yts-capability-status.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * 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> - */ - -#include <stdbool.h> - -#include "yts-capability-status.h" -#include "config.h" - -G_DEFINE_TYPE (YtsCapabilityStatus, yts_capability_status, YTS_TYPE_METADATA) - -#define GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), YTS_TYPE_CAPABILITY_STATUS, YtsCapabilityStatusPrivate)) - -typedef struct { - int dummy; -} YtsCapabilityStatusPrivate; - -static void -_get_property (GObject *object, - unsigned int property_id, - GValue *value, - GParamSpec *pspec) -{ - switch (property_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } -} - -static void -_set_property (GObject *object, - unsigned int property_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (property_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } -} - -static void -_dispose (GObject *object) -{ - G_OBJECT_CLASS (yts_capability_status_parent_class)->dispose (object); -} - -static void -yts_capability_status_class_init (YtsCapabilityStatusClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (YtsCapabilityStatusPrivate)); - - object_class->get_property = _get_property; - object_class->set_property = _set_property; - object_class->dispose = _dispose; -} - -static void -yts_capability_status_init (YtsCapabilityStatus *self) -{ -} - -YtsMetadata * -yts_capability_status_new (char const *capability, - char const *aspect, - GVariant *condition) -{ - RestXmlNode *node; - - node = rest_xml_node_add_child (NULL, "status"); - /* PONDERING need those keywords be made reserved */ - rest_xml_node_add_attr (node, "type", "notification"); - rest_xml_node_add_attr (node, "capability", capability); - rest_xml_node_add_attr (node, "aspect", aspect); - - if (condition) { - char *args = g_variant_print (condition, false); - /* FIXME this is just a stopgap solution to lacking g_markup_unescape_text() - * want to move to complex message bodies anywy. */ - char *escaped_args = g_uri_escape_string (args, NULL, true); - rest_xml_node_add_attr (node, "condition", escaped_args); - g_free (escaped_args); - g_free (args); - } - - return g_object_new (YTS_TYPE_CAPABILITY_STATUS, - "top-level-node", node, - NULL); -} - diff --git a/ytstenut/yts-capability-status.h b/ytstenut/yts-capability-status.h deleted file mode 100644 index 233e283..0000000 --- a/ytstenut/yts-capability-status.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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_CAPABILITY_STATUS_H -#define YTS_CAPABILITY_STATUS_H - -#include <glib-object.h> -#include <ytstenut/yts-metadata.h> - -G_BEGIN_DECLS - -#define YTS_TYPE_CAPABILITY_STATUS yts_capability_status_get_type() - -#define YTS_CAPABILITY_STATUS(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), YTS_TYPE_CAPABILITY_STATUS, YtsCapabilityStatus)) - -#define YTS_CAPABILITY_STATUS_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), YTS_TYPE_CAPABILITY_STATUS, YtsCapabilityStatusClass)) - -#define YTS_IS_CAPABILITY_STATUS(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), YTS_TYPE_CAPABILITY_STATUS)) - -#define YTS_IS_CAPABILITY_STATUS_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), YTS_TYPE_CAPABILITY_STATUS)) - -#define YTS_CAPABILITY_STATUS_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), YTS_TYPE_CAPABILITY_STATUS, YtsCapabilityStatusClass)) - -typedef struct { - YtsMetadata parent; -} YtsCapabilityStatus; - -typedef struct { - YtsMetadataClass parent; -} YtsCapabilityStatusClass; - -GType -yts_capability_status_get_type (void) G_GNUC_CONST; - -YtsMetadata * -yts_capability_status_new (char const *capability, - char const *aspect, - GVariant *condition); - -G_END_DECLS - -#endif /* YTS_CAPABILITY_STATUS_H */ diff --git a/ytstenut/yts-metadata.c b/ytstenut/yts-metadata.c index 528e0e1..2e25810 100644 --- a/ytstenut/yts-metadata.c +++ b/ytstenut/yts-metadata.c @@ -20,7 +20,7 @@ /** * SECTION:yts-metadata - * @short_description: Base class for #YtsStatus and #YtsMessage. + * @short_description: Base class for #YtsMessage. * * #YtsMetadata is a base class for Ytstenut metadata classes. */ @@ -30,7 +30,6 @@ #include "yts-metadata-internal.h" #include "yts-message.h" -#include "yts-status.h" #include "config.h" static void yts_metadata_dispose (GObject *object); @@ -273,8 +272,7 @@ yts_metadata_get_root_node (YtsMetadata *self) * yts_metadata_new_from_xml: * @xml: the xml the metatdata object is to represent * - * Constructs a new #YtsMetadata object from the xml snippet; depending on the - * xml, this is either #YtsMessage or #YtsStatus. + * Constructs a new #YtsMetadata object from the xml snippet. */ YtsMetadata * yts_metadata_new_from_xml (const char *xml) @@ -307,8 +305,7 @@ yts_metadata_new_from_xml (const char *xml) * * Private constructor. * - * Return value: (transfer full): newly allocated #YtsMetadata subclass, either - * #YtsMessage or #YtsStatus, depending on the top level node. + * Return value: (transfer full): newly allocated #YtsMetadata subclass. */ YtsMetadata * yts_metadata_new_from_node (RestXmlNode *node, @@ -328,52 +325,6 @@ yts_metadata_new_from_node (RestXmlNode *node, else mdata = g_object_new (YTS_TYPE_MESSAGE, "top-level-node", node, NULL); } - else if (!g_strcmp0 (node->name, "status")) - { - if (attributes) - { - char const *const *p; - gboolean have_caps = FALSE; - gboolean have_activity = FALSE; - gboolean have_xmlns = FALSE; - gboolean have_from = FALSE; - - for (p = attributes; *p; ++p) - { - if (!g_strcmp0 (*p, "capability")) - have_caps = TRUE; - else if (!g_strcmp0 (*p, "activity")) - have_activity = TRUE; - else if (!g_strcmp0 (*p, "xmlns")) - have_xmlns = TRUE; - else if (!g_strcmp0 (*p, "from-service")) - have_from = TRUE; - } - - if (!have_caps || !have_activity || !have_from) - { - g_warning ("Cannot construct YtsStatus without capability, " - "activity and from-service attributes."); - return NULL; - } - - if (have_xmlns) - { - g_warning ("xmlns attribute is not allowed when constructing " - "YtsStatus"); - return NULL; - } - - mdata = g_object_new (YTS_TYPE_STATUS, - "top-level-node", node, - "attributes", attributes, - NULL); - - yts_metadata_add_attribute (mdata, "xmlns", "urn:ytstenut:status"); - } - else - mdata = g_object_new (YTS_TYPE_STATUS, "top-level-node", node, NULL); - } else g_warning ("Unknown top level node '%s'", node->name); @@ -608,8 +559,8 @@ yts_rest_xml_node_check_children (RestXmlNode *node0, RestXmlNode *node1) * @other: #YtsMetadata * * Compares two metadata instances and returns %TRUE if they are equal. - * NB: equality implies identity of type, i.e., #YtsMessage and #YtsStatus - * can be compared, but will always be unequal. + * NB: equality implies identity of type, i.e., different subclasses will + * always be unequal. * * Return value: %TRUE if equal, %FALSE otherwise. */ diff --git a/ytstenut/yts-status.c b/ytstenut/yts-status.c deleted file mode 100644 index 92e57be..0000000 --- a/ytstenut/yts-status.c +++ /dev/null @@ -1,165 +0,0 @@ -/* - * 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: Tomas Frydrych <tf@linux.intel.com> - */ - -/** - * SECTION:yts-status - * @short_description: Represent the status of a service connected - * to the Ytstenut mesh. - * - * #YtsStatus represents status of a known service in the Ytstenut application - * mesh. - */ - -#include <rest/rest-xml-node.h> - -#include "yts-metadata-internal.h" -#include "yts-status.h" -#include "config.h" - -static void yts_status_dispose (GObject *object); -static void yts_status_finalize (GObject *object); -static void yts_status_constructed (GObject *object); -static void yts_status_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec); -static void yts_status_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec); - -G_DEFINE_TYPE (YtsStatus, yts_status, YTS_TYPE_METADATA); - -#define YTS_STATUS_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), YTS_TYPE_STATUS, YtsStatusPrivate)) - -struct _YtsStatusPrivate -{ - guint disposed : 1; -}; - -enum -{ - N_SIGNALS, -}; - -enum -{ - PROP_0, -}; - -/*static guint signals[N_SIGNALS] = {0};*/ - -static void -yts_status_class_init (YtsStatusClass *klass) -{ - GObjectClass *object_class = (GObjectClass *)klass; - - g_type_class_add_private (klass, sizeof (YtsStatusPrivate)); - - object_class->dispose = yts_status_dispose; - object_class->finalize = yts_status_finalize; - object_class->constructed = yts_status_constructed; - object_class->get_property = yts_status_get_property; - object_class->set_property = yts_status_set_property; -} - -static void -yts_status_constructed (GObject *object) -{ - if (G_OBJECT_CLASS (yts_status_parent_class)->constructed) - G_OBJECT_CLASS (yts_status_parent_class)->constructed (object); -} - -static void -yts_status_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) -{ - switch (property_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } -} - -static void -yts_status_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (property_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } -} - -static void -yts_status_init (YtsStatus *self) -{ - self->priv = YTS_STATUS_GET_PRIVATE (self); -} - -static void -yts_status_dispose (GObject *object) -{ - YtsStatus *self = (YtsStatus*) object; - YtsStatusPrivate *priv = self->priv; - - if (priv->disposed) - return; - - priv->disposed = TRUE; - - G_OBJECT_CLASS (yts_status_parent_class)->dispose (object); -} - -static void -yts_status_finalize (GObject *object) -{ - G_OBJECT_CLASS (yts_status_parent_class)->finalize (object); -} - -/** - * yts_status_new: - * @attributes: NULL terminated array of name/value pairs; can be %NULL - * - * Constructs a new #YtsStatus object, setting the top level attributes. - * - * Return value: (transfer full): newly allocated #YtsStatus object. - */ -YtsStatus * -yts_status_new (const char ** attributes) -{ - RestXmlNode *top = rest_xml_node_add_child (NULL, "status"); - YtsMetadata *mdata; - - g_return_val_if_fail (top, NULL); - - mdata = yts_metadata_new_from_node (top, attributes); - - g_return_val_if_fail (YTS_IS_STATUS (mdata), NULL); - - return (YtsStatus*) mdata; -} - diff --git a/ytstenut/yts-status.h b/ytstenut/yts-status.h deleted file mode 100644 index 28e3cf2..0000000 --- a/ytstenut/yts-status.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * 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: Tomas Frydrych <tf@linux.intel.com> - */ - -#ifndef YTS_STATUS_H -#define YTS_STATUS_H - -#include <ytstenut/yts-metadata.h> - -G_BEGIN_DECLS - -#define YTS_TYPE_STATUS \ - (yts_status_get_type()) -#define YTS_STATUS(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - YTS_TYPE_STATUS, \ - YtsStatus)) -#define YTS_STATUS_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - YTS_TYPE_STATUS, \ - YtsStatusClass)) -#define YTS_IS_STATUS(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - YTS_TYPE_STATUS)) -#define YTS_IS_STATUS_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - YTS_TYPE_STATUS)) -#define YTS_STATUS_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - YTS_TYPE_STATUS, \ - YtsStatusClass)) - -typedef struct _YtsStatus YtsStatus; -typedef struct _YtsStatusClass YtsStatusClass; -typedef struct _YtsStatusPrivate YtsStatusPrivate; - -/** - * YtsStatusClass: - * - * #YtsStatus class. - */ -struct _YtsStatusClass -{ - /*< private >*/ - YtsMetadataClass parent_class; -}; - -/** - * YtsStatus: - * - * Status of a #YtsService or #YtsClient. - */ -struct _YtsStatus -{ - /*< private >*/ - YtsMetadata parent; - - /*< private >*/ - YtsStatusPrivate *priv; -}; - -GType yts_status_get_type (void) G_GNUC_CONST; - -YtsStatus *yts_status_new (const char **attributes); - -G_END_DECLS - -#endif /* YTS_STATUS_H */ diff --git a/ytstenut/ytstenut.sym b/ytstenut/ytstenut.sym index 032010a..b577e41 100644 --- a/ytstenut/ytstenut.sym +++ b/ytstenut/ytstenut.sym @@ -1,8 +1,6 @@ yts_capability_get_type yts_capability_get_fqc_ids yts_capability_has_fqc_id -yts_capability_status_get_type -yts_capability_status_new yts_capability_mode_get_type yts_client_connect yts_client_disconnect @@ -52,7 +50,6 @@ yts_service_get_type yts_service_send_text yts_service_send_list yts_service_send_dictionary -yts_status_new yts_vp_content_get_type yts_vp_query_get_max_results yts_vp_query_get_progress |