_gen-tp-constants.h   _gen-tp-constants.h 
/* Generated from the Telepathy spec, version 0.15.2 /* Generated from the Telepathy spec, version 0.15.3
Copyright (C) 2005, 2006, 2007 Collabora Limited Copyright (C) 2005, 2006, 2007 Collabora Limited
Copyright (C) 2005, 2006, 2007 Nokia Corporation Copyright (C) 2005, 2006, 2007 Nokia Corporation
Copyright (C) 2006 INdT Copyright (C) 2006 INdT
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version. 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, This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details. Library General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, U SA.
*/ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* TpConnMgrParamFlags (bitfield/set of flags, 0 for none) */ /* TpConnMgrParamFlags (bitfield/set of flags, 0 for none) */
typedef enum { typedef enum {
skipping to change at line 301 skipping to change at line 301
typedef enum { typedef enum {
TP_CHANNEL_GROUP_CHANGE_REASON_NONE = 0, TP_CHANNEL_GROUP_CHANGE_REASON_NONE = 0,
TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE = 1, TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE = 1,
TP_CHANNEL_GROUP_CHANGE_REASON_KICKED = 2, TP_CHANNEL_GROUP_CHANGE_REASON_KICKED = 2,
TP_CHANNEL_GROUP_CHANGE_REASON_BUSY = 3, TP_CHANNEL_GROUP_CHANGE_REASON_BUSY = 3,
TP_CHANNEL_GROUP_CHANGE_REASON_INVITED = 4, TP_CHANNEL_GROUP_CHANGE_REASON_INVITED = 4,
TP_CHANNEL_GROUP_CHANGE_REASON_BANNED = 5, TP_CHANNEL_GROUP_CHANGE_REASON_BANNED = 5,
TP_CHANNEL_GROUP_CHANGE_REASON_ERROR = 6, TP_CHANNEL_GROUP_CHANGE_REASON_ERROR = 6,
TP_CHANNEL_GROUP_CHANGE_REASON_INVALID_CONTACT = 7, TP_CHANNEL_GROUP_CHANGE_REASON_INVALID_CONTACT = 7,
TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER = 8, TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER = 8,
TP_CHANNEL_GROUP_CHANGE_REASON_RENAMED = 9,
NUM_TP_CHANNEL_GROUP_CHANGE_REASONS NUM_TP_CHANNEL_GROUP_CHANGE_REASONS
} TelepathyChannelGroupChangeReason; } TelepathyChannelGroupChangeReason;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_CHANNEL_GROUP_CHANGE_REASON NUM_TP_CHANNEL_GROUP_CHANGE_REA SONS #define LAST_TP_CHANNEL_GROUP_CHANGE_REASON NUM_TP_CHANNEL_GROUP_CHANGE_REA SONS
#endif #endif
/* TpChannelHoldState (enum) */ /* TpChannelHoldState (enum) */
typedef enum { typedef enum {
TP_CHANNEL_HOLD_STATE_NONE = 0, TP_CHANNEL_HOLD_STATE_NONE = 0,
 End of changes. 3 change blocks. 
2 lines changed or deleted 3 lines changed or added


 _gen-tp-interfaces.h   _gen-tp-interfaces.h 
skipping to change at line 19 skipping to change at line 19
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version. 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, This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details. Library General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, U SA.
*/ */
#define TP_IFACE_CONN_MANAGER \ #define TP_IFACE_CONN_MANAGER \
"org.freedesktop.Telepathy.ConnectionManager" "org.freedesktop.Telepathy.ConnectionManager"
#define TP_IFACE_CONN \ #define TP_IFACE_CONN \
"org.freedesktop.Telepathy.Connection" "org.freedesktop.Telepathy.Connection"
#define TP_IFACE_CONN_INTERFACE_ALIASING \ #define TP_IFACE_CONN_INTERFACE_ALIASING \
"org.freedesktop.Telepathy.Connection.Interface.Aliasing" "org.freedesktop.Telepathy.Connection.Interface.Aliasing"
#define TP_IFACE_CONN_INTERFACE_AVATARS \ #define TP_IFACE_CONN_INTERFACE_AVATARS \
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 tp-conn.h   tp-conn.h 
skipping to change at line 105 skipping to change at line 105
* @param name: The D-BUS service name for the connection object * @param name: The D-BUS service name for the connection object
* @param path_name: The D-BUS path name for the connection object * @param path_name: The D-BUS path name for the connection object
* @param interface_name: The D-BUS interface name for the connection objec t * @param interface_name: The D-BUS interface name for the connection objec t
* @return A new TpConn connection object, or NULL if unsuccesful. * @return A new TpConn connection object, or NULL if unsuccesful.
*/ */
TpConn *tp_conn_new(DBusGConnection *connection, TpConn *tp_conn_new(DBusGConnection *connection,
const char *bus_name, const char *bus_name,
const char *object_path); const char *object_path);
/* Create a new #TpConn and connect signal handlers, but do not try to conn
ect
* asynchronously.
*
* If TP_CONN_STATUS_CONNECTED is written through @status, the new connecti
on
* is connected, and has its interfaces set up and is ready for use.
* Otherwise, the caller is responsible for calling Connect and waiting for
* the connection attempt to either succeed or fail.
*
* @param connection: A bus connection
* @param bus_name: The bus name of the CM
* @param object_path: The object path at that bus name for which a proxy i
s
* required
* @param status: Used to return the connection's status at the time we fou
nd
* it
* @param error: Used to return the error if NULL is returned
*
* @return A new TpConn object, or NULL if GetNameOwner, GetStatus or
* GetInterfaces fails
*/
TpConn *tp_conn_new_without_connect (DBusGConnection *connection,
const char *bus_name, const char *object_path,
guint *status, GError **error);
/* Create a TpChan channel object for this connection. Also initialises /* Create a TpChan channel object for this connection. Also initialises
* the proxy object that is used for the actual method calls. * the proxy object that is used for the actual method calls.
* *
* @param connection: The DBusGConnection for the channel * @param connection: The DBusGConnection for the channel
* @param tpconn: The Connection object for which the channel is done * @param tpconn: The Connection object for which the channel is done
* @param bus_name: The D-Bus interface name for the channel * @param bus_name: The D-Bus interface name for the channel
* @param type: The channel type string * @param type: The channel type string
* @param handle_type: The type of the channel handle * @param handle_type: The type of the channel handle
* @param handle: The channel handle value is set and stored here after * @param handle: The channel handle value is set and stored here after
* @param the call returns. * @param the call returns.
 End of changes. 1 change blocks. 
0 lines changed or deleted 27 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/