diff options
| -rw-r--r-- | docs/reference/telepathy-glib-sections.txt | 24 | ||||
| -rw-r--r-- | telepathy-glib/defs.h | 91 | ||||
| -rw-r--r-- | telepathy-glib/extra-gtkdoc.h | 29 | ||||
| -rw-r--r-- | telepathy-glib/interfaces.c | 132 | ||||
| -rw-r--r-- | telepathy-glib/interfaces.h | 13 |
5 files changed, 157 insertions, 132 deletions
diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt index 4d7d53812..f05da64ac 100644 --- a/docs/reference/telepathy-glib-sections.txt +++ b/docs/reference/telepathy-glib-sections.txt @@ -18,18 +18,6 @@ TpChannelPrivate <INCLUDE>telepathy-glib/defs.h</INCLUDE> <FILE>defs</FILE> <TITLE>defs</TITLE> -TP_CM_BUS_NAME_BASE -TP_CM_OBJECT_PATH_BASE -TP_CONN_BUS_NAME_BASE -TP_CONN_OBJECT_PATH_BASE -TP_ACCOUNT_MANAGER_BUS_NAME -TP_ACCOUNT_MANAGER_OBJECT_PATH -TP_ACCOUNT_OBJECT_PATH_BASE -TP_CHANNEL_DISPATCHER_BUS_NAME -TP_CHANNEL_DISPATCHER_OBJECT_PATH -TP_CLIENT_BUS_NAME_BASE -TP_CLIENT_OBJECT_PATH_BASE -TP_DEBUG_OBJECT_PATH TP_USER_ACTION_TIME_NOT_USER_ACTION TP_USER_ACTION_TIME_CURRENT_TIME </SECTION> @@ -2264,6 +2252,18 @@ TP_NUM_MEDIA_STREAM_TYPES <FILE>interfaces</FILE> <TITLE>interfaces</TITLE> <INCLUDE>telepathy-glib/interfaces.h</INCLUDE> +TP_CM_BUS_NAME_BASE +TP_CM_OBJECT_PATH_BASE +TP_CONN_BUS_NAME_BASE +TP_CONN_OBJECT_PATH_BASE +TP_ACCOUNT_MANAGER_BUS_NAME +TP_ACCOUNT_MANAGER_OBJECT_PATH +TP_ACCOUNT_OBJECT_PATH_BASE +TP_CHANNEL_DISPATCHER_BUS_NAME +TP_CHANNEL_DISPATCHER_OBJECT_PATH +TP_CLIENT_BUS_NAME_BASE +TP_CLIENT_OBJECT_PATH_BASE +TP_DEBUG_OBJECT_PATH TP_IFACE_ACCOUNT TP_IFACE_QUARK_ACCOUNT TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h index ad000a4d5..07adeeefb 100644 --- a/telepathy-glib/defs.h +++ b/telepathy-glib/defs.h @@ -27,97 +27,6 @@ G_BEGIN_DECLS /** - * TP_CM_BUS_NAME_BASE: - * - * The prefix for a connection manager's bus name, to which the CM's name - * (e.g. "gabble") should be appended. - */ -#define TP_CM_BUS_NAME_BASE "im.telepathy1.ConnectionManager." - -/** - * TP_CM_OBJECT_PATH_BASE: - * - * The prefix for a connection manager's object path, to which the CM's name - * (e.g. "gabble") should be appended. - */ -#define TP_CM_OBJECT_PATH_BASE "/im/telepathy1/ConnectionManager/" - -/** - * TP_CONN_BUS_NAME_BASE: - * - * The prefix for a connection's bus name, to which the CM's name - * (e.g. "gabble"), the protocol (e.g. "jabber") and an element or sequence - * of elements representing the account should be appended. - */ -#define TP_CONN_BUS_NAME_BASE "im.telepathy1.Connection." - -/** - * TP_CONN_OBJECT_PATH_BASE: - * - * The prefix for a connection's object path, to which the CM's name - * (e.g. "gabble"), the protocol (e.g. "jabber") and an element or sequence - * of elements representing the account should be appended. - */ -#define TP_CONN_OBJECT_PATH_BASE "/im/telepathy1/Connection/" - -/** - * TP_ACCOUNT_MANAGER_BUS_NAME: - * - * The account manager's well-known bus name - */ -#define TP_ACCOUNT_MANAGER_BUS_NAME "im.telepathy1.AccountManager" - -/** - * TP_ACCOUNT_MANAGER_OBJECT_PATH: - * - * The account manager's standard object path - */ -#define TP_ACCOUNT_MANAGER_OBJECT_PATH "/im/telepathy1/AccountManager" - -/** - * TP_ACCOUNT_OBJECT_PATH_BASE: - * - * The common prefix of the object path for all Account objects. - */ -#define TP_ACCOUNT_OBJECT_PATH_BASE "/im/telepathy1/Account/" - -/** - * TP_CHANNEL_DISPATCHER_BUS_NAME: - * - * The channel dispatcher's well-known bus name - */ -#define TP_CHANNEL_DISPATCHER_BUS_NAME "im.telepathy1.ChannelDispatcher" - -/** - * TP_CHANNEL_DISPATCHER_OBJECT_PATH: - * - * The channel dispatcher's standard object path - */ -#define TP_CHANNEL_DISPATCHER_OBJECT_PATH "/im/telepathy1/ChannelDispatcher" - -/** - * TP_CLIENT_BUS_NAME_BASE: - * - * The common prefix of the well-known bus name for any Telepathy Client. - */ -#define TP_CLIENT_BUS_NAME_BASE "im.telepathy1.Client." - -/** - * TP_CLIENT_OBJECT_PATH_BASE: - * - * The common prefix of the well-known object path for any Telepathy Client. - */ -#define TP_CLIENT_OBJECT_PATH_BASE "/im/telepathy1/Client/" - -/** - * TP_DEBUG_OBJECT_PATH: - * - * The standard path for objects implementing the Telepathy Debug interface - * (#TpSvcDebug). - */ -#define TP_DEBUG_OBJECT_PATH "/im/telepathy1/debug" - -/** * TP_USER_ACTION_TIME_NOT_USER_ACTION: * * The "user action time" used by methods like diff --git a/telepathy-glib/extra-gtkdoc.h b/telepathy-glib/extra-gtkdoc.h index e9f532416..1bcf46f48 100644 --- a/telepathy-glib/extra-gtkdoc.h +++ b/telepathy-glib/extra-gtkdoc.h @@ -337,35 +337,6 @@ */ /** - * SECTION:interfaces - * @title: Telepathy protocol interface and property names - * @short_description: D-Bus interface and property names from the - * Telepathy spec - * - * This header exposes the interface names from the Telepathy specification - * as cpp defines for strings, such as %TP_IFACE_PROPERTIES_INTERFACE. - * It is automatically generated from the specification. - * - * Since 0.7.0 it also provides cpp defines like - * %TP_IFACE_QUARK_PROPERTIES_INTERFACE, which expand to function calls that - * return GQuarks for the same strings. - * - * Since 0.9.2 it also provides cpp defines like - * %TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS, which expand to string - * constants representing fully-qualified D-Bus property names, like - * <literal>im.telepathy1.Channel.Interface.Group.GroupFlags</literal>. - * - * Since 0.11.5 it also provides cpp defines like - * %TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS for contact attributes like - * "im.telepathy1.Connection.Interface.Aliasing/alias", - * and defines like - * %TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_ICE_UDP - * for handler capability tokens like - * "im.telepathy1.Channel.Interface.MediaSignalling/gtalk-p2p". - * (These were present in an incorrect form since 0.11.3.) - */ - -/** * SECTION:errors * @title: Telepathy protocol errors * @short_description: The errors from the Telepathy D-Bus spec, as a diff --git a/telepathy-glib/interfaces.c b/telepathy-glib/interfaces.c index 598cc7ce5..be5d8aaa9 100644 --- a/telepathy-glib/interfaces.c +++ b/telepathy-glib/interfaces.c @@ -1,4 +1,136 @@ +/* + * telepathy-glib D-Bus interface names and related definitions + * + * Copyright © 2007-2012 Collabora Ltd. + * Copyright © 2007-2009 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 + */ + #include <telepathy-glib/interfaces.h> /* auto-generated implementation stubs */ #include "_gen/interfaces-body.h" + +/** + * SECTION:interfaces + * @title: Telepathy protocol interface and property names + * @short_description: D-Bus interface and property names from the + * Telepathy spec + * + * This header exposes the interface names from the Telepathy specification + * as cpp defines for strings, such as %TP_IFACE_PROPERTIES_INTERFACE. + * These are automatically generated from the specification. + * + * It also provides related constants such as the common prefix of + * all connection managers' bus names and object paths. + * + * Since 0.7.0 it also provides cpp defines like + * %TP_IFACE_QUARK_PROPERTIES_INTERFACE, which expand to function calls that + * return GQuarks for the same strings. + * + * Since 0.9.2 it also provides cpp defines like + * %TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS, which expand to string + * constants representing fully-qualified D-Bus property names, like + * <literal>im.telepathy1.Channel.Interface.Group.GroupFlags</literal>. + * + * Since 0.11.5 it also provides cpp defines like + * %TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS for contact attributes like + * "im.telepathy1.Connection.Interface.Aliasing/alias", + * and defines like + * %TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_ICE_UDP + * for handler capability tokens like + * "im.telepathy1.Channel.Interface.MediaSignalling/gtalk-p2p". + * (These were present in an incorrect form since 0.11.3.) + */ + +/** + * TP_CM_BUS_NAME_BASE: + * + * The prefix for a connection manager's bus name, to which the CM's name + * (e.g. "gabble") should be appended. + */ + +/** + * TP_CM_OBJECT_PATH_BASE: + * + * The prefix for a connection manager's object path, to which the CM's name + * (e.g. "gabble") should be appended. + */ + +/** + * TP_CONN_BUS_NAME_BASE: + * + * The prefix for a connection's bus name, to which the CM's name + * (e.g. "gabble"), the protocol (e.g. "jabber") and an element or sequence + * of elements representing the account should be appended. + */ + +/** + * TP_CONN_OBJECT_PATH_BASE: + * + * The prefix for a connection's object path, to which the CM's name + * (e.g. "gabble"), the protocol (e.g. "jabber") and an element or sequence + * of elements representing the account should be appended. + */ + +/** + * TP_ACCOUNT_MANAGER_BUS_NAME: + * + * The account manager's well-known bus name + */ + +/** + * TP_ACCOUNT_MANAGER_OBJECT_PATH: + * + * The account manager's standard object path + */ + +/** + * TP_ACCOUNT_OBJECT_PATH_BASE: + * + * The common prefix of the object path for all Account objects. + */ + +/** + * TP_CHANNEL_DISPATCHER_BUS_NAME: + * + * The channel dispatcher's well-known bus name + */ + +/** + * TP_CHANNEL_DISPATCHER_OBJECT_PATH: + * + * The channel dispatcher's standard object path + */ + +/** + * TP_CLIENT_BUS_NAME_BASE: + * + * The common prefix of the well-known bus name for any Telepathy Client. + */ + +/** + * TP_CLIENT_OBJECT_PATH_BASE: + * + * The common prefix of the well-known object path for any Telepathy Client. + */ + +/** + * TP_DEBUG_OBJECT_PATH: + * + * The standard path for objects implementing the Telepathy Debug interface + * (#TpSvcDebug). + */ diff --git a/telepathy-glib/interfaces.h b/telepathy-glib/interfaces.h index 202d38976..3bb12cdcf 100644 --- a/telepathy-glib/interfaces.h +++ b/telepathy-glib/interfaces.h @@ -5,6 +5,19 @@ G_BEGIN_DECLS +#define TP_CM_BUS_NAME_BASE "im.telepathy1.ConnectionManager." +#define TP_CM_OBJECT_PATH_BASE "/im/telepathy1/ConnectionManager/" +#define TP_CONN_BUS_NAME_BASE "im.telepathy1.Connection." +#define TP_CONN_OBJECT_PATH_BASE "/im/telepathy1/Connection/" +#define TP_ACCOUNT_MANAGER_BUS_NAME "im.telepathy1.AccountManager" +#define TP_ACCOUNT_MANAGER_OBJECT_PATH "/im/telepathy1/AccountManager" +#define TP_ACCOUNT_OBJECT_PATH_BASE "/im/telepathy1/Account/" +#define TP_CHANNEL_DISPATCHER_BUS_NAME "im.telepathy1.ChannelDispatcher" +#define TP_CHANNEL_DISPATCHER_OBJECT_PATH "/im/telepathy1/ChannelDispatcher" +#define TP_CLIENT_BUS_NAME_BASE "im.telepathy1.Client." +#define TP_CLIENT_OBJECT_PATH_BASE "/im/telepathy1/Client/" +#define TP_DEBUG_OBJECT_PATH "/im/telepathy1/debug" + #include <telepathy-glib/_gen/telepathy-interfaces.h> G_END_DECLS |