tp-ch-gen.h   tp-ch-gen.h 
skipping to change at line 29 skipping to change at line 29
#endif #endif
#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_ChannelHandler #ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_ChannelHandler
#define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_ChannelHandler #define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_ChannelHandler
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
gboolean gboolean
tp_ch_handle_channel (DBusGProxy *proxy, const char * IN_bus_name, const ch ar* IN_connection, const char * IN_channel_type, const char* IN_channel, co nst guint IN_handle_type, const guint IN_handle, GError **error) tp_ch_handle_channel (DBusGProxy *proxy, const char * IN_Bus_Name, const ch ar* IN_Connection, const char * IN_Channel_Type, const char* IN_Channel, co nst guint IN_Handle_Type, const guint IN_Handle, GError **error)
{ {
return dbus_g_proxy_call (proxy, "HandleChannel", error, G_TYPE_STRING, I N_bus_name, DBUS_TYPE_G_OBJECT_PATH, IN_connection, G_TYPE_STRING, IN_chann el_type, DBUS_TYPE_G_OBJECT_PATH, IN_channel, G_TYPE_UINT, IN_handle_type, G_TYPE_UINT, IN_handle, G_TYPE_INVALID, G_TYPE_INVALID); return dbus_g_proxy_call (proxy, "HandleChannel", error, G_TYPE_STRING, I N_Bus_Name, DBUS_TYPE_G_OBJECT_PATH, IN_Connection, G_TYPE_STRING, IN_Chann el_Type, DBUS_TYPE_G_OBJECT_PATH, IN_Channel, G_TYPE_UINT, IN_Handle_Type, G_TYPE_UINT, IN_Handle, G_TYPE_INVALID, G_TYPE_INVALID);
} }
typedef void (*tp_ch_handle_channel_reply) (DBusGProxy *proxy, GError *erro r, gpointer userdata); typedef void (*tp_ch_handle_channel_reply) (DBusGProxy *proxy, GError *erro r, gpointer userdata);
static void static void
tp_ch_handle_channel_async_callback (DBusGProxy *proxy, DBusGProxyCall *cal l, void *user_data) tp_ch_handle_channel_async_callback (DBusGProxy *proxy, DBusGProxyCall *cal l, void *user_data)
{ {
DBusGAsyncData *data = (DBusGAsyncData*) user_data; DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL; GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID); dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
(*(tp_ch_handle_channel_reply)data->cb) (proxy, error, data->userdata); (*(tp_ch_handle_channel_reply)data->cb) (proxy, error, data->userdata);
return; return;
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
DBusGProxyCall* DBusGProxyCall*
tp_ch_handle_channel_async (DBusGProxy *proxy, const char * IN_bus_name, co nst char* IN_connection, const char * IN_channel_type, const char* IN_chann el, const guint IN_handle_type, const guint IN_handle, tp_ch_handle_channel _reply callback, gpointer userdata) tp_ch_handle_channel_async (DBusGProxy *proxy, const char * IN_Bus_Name, co nst char* IN_Connection, const char * IN_Channel_Type, const char* IN_Chann el, const guint IN_Handle_Type, const guint IN_Handle, tp_ch_handle_channel _reply callback, gpointer userdata)
{ {
DBusGAsyncData *stuff; DBusGAsyncData *stuff;
stuff = g_slice_new (DBusGAsyncData); stuff = g_slice_new (DBusGAsyncData);
stuff->cb = G_CALLBACK (callback); stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata; stuff->userdata = userdata;
return dbus_g_proxy_begin_call (proxy, "HandleChannel", tp_ch_handle_chan nel_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_bu s_name, DBUS_TYPE_G_OBJECT_PATH, IN_connection, G_TYPE_STRING, IN_channel_t ype, DBUS_TYPE_G_OBJECT_PATH, IN_channel, G_TYPE_UINT, IN_handle_type, G_TY PE_UINT, IN_handle, G_TYPE_INVALID); return dbus_g_proxy_begin_call (proxy, "HandleChannel", tp_ch_handle_chan nel_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_Bu s_Name, DBUS_TYPE_G_OBJECT_PATH, IN_Connection, G_TYPE_STRING, IN_Channel_T ype, DBUS_TYPE_G_OBJECT_PATH, IN_Channel, G_TYPE_UINT, IN_Handle_Type, G_TY PE_UINT, IN_Handle, G_TYPE_INVALID);
} }
#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Chann elHandler */ #endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Chann elHandler */
G_END_DECLS G_END_DECLS
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 tp-chan.h   tp-chan.h 
skipping to change at line 61 skipping to change at line 61
#define TELEPATHY_CHAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \ #define TELEPATHY_CHAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \
((obj), TELEPATHY_CHAN_TYPE, TpChanClass)) ((obj), TELEPATHY_CHAN_TYPE, TpChanClass))
/* For backwards compatibility only. */ /* For backwards compatibility only. */
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define TELEPATHY_CHAN_IFACE_QUARK \ #define TELEPATHY_CHAN_IFACE_QUARK \
TP_IFACE_QUARK_CHANNEL TP_IFACE_QUARK_CHANNEL
#define TELEPATHY_CHAN_IFACE_CONTACTLIST_QUARK \ #define TELEPATHY_CHAN_IFACE_CONTACTLIST_QUARK \
TP_IFACE_QUARK_CONTACT_LIST TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_LIST
#define TELEPATHY_CHAN_IFACE_STREAMED_QUARK \ #define TELEPATHY_CHAN_IFACE_STREAMED_QUARK \
TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA
#define TELEPATHY_CHAN_IFACE_ROOMLIST_QUARK \ #define TELEPATHY_CHAN_IFACE_ROOMLIST_QUARK \
TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST
#define TELEPATHY_CHAN_IFACE_TEXT_QUARK \ #define TELEPATHY_CHAN_IFACE_TEXT_QUARK \
TP_IFACE_QUARK_CHANNEL_TYPE_TEXT TP_IFACE_QUARK_CHANNEL_TYPE_TEXT
#define TELEPATHY_CHAN_IFACE_DTMF_QUARK \ #define TELEPATHY_CHAN_IFACE_DTMF_QUARK \
TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF
#define TELEPATHY_CHAN_IFACE_CHAT_STATE_QUARK \ #define TELEPATHY_CHAN_IFACE_CHAT_STATE_QUARK \
TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE
 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 62 skipping to change at line 62
#define TELEPATHY_IS_CONN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE \ #define TELEPATHY_IS_CONN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE \
((klass), TELEPATHY_CONN_TYPE)) ((klass), TELEPATHY_CONN_TYPE))
#define TELEPATHY_CONN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \ #define TELEPATHY_CONN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \
((obj), TELEPATHY_CONN_TYPE, TpConnClass)) ((obj), TELEPATHY_CONN_TYPE, TpConnClass))
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
/* For backwards compatibility only. Use TP_IFACE_QUARK_* in new code */ /* For backwards compatibility only. Use TP_IFACE_QUARK_* in new code */
#define TELEPATHY_CONN_IFACE_QUARK \ #define TELEPATHY_CONN_IFACE_QUARK \
TP_IFACE_QUARK_CONNECTION_INTERFACE TP_IFACE_QUARK_CONNECTION
#define TELEPATHY_CONN_IFACE_ALIASING_QUARK \ #define TELEPATHY_CONN_IFACE_ALIASING_QUARK \
TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING
#define TELEPATHY_CONN_IFACE_AVATARS_QUARK \ #define TELEPATHY_CONN_IFACE_AVATARS_QUARK \
TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS
#define TELEPATHY_CONN_IFACE_CAPABILITIES_QUARK \ #define TELEPATHY_CONN_IFACE_CAPABILITIES_QUARK \
TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES
#define TELEPATHY_CONN_IFACE_CONTACTINFO_QUARK \ #define TELEPATHY_CONN_IFACE_CONTACTINFO_QUARK \
TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO
#define TELEPATHY_CONN_IFACE_FORWARDING_QUARK \ #define TELEPATHY_CONN_IFACE_FORWARDING_QUARK \
TP_IFACE_QUARK_CONNECTION_INTERFACE_FORWARDING TP_IFACE_QUARK_CONNECTION_INTERFACE_FORWARDING
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 tp-constants.h   tp-constants.h 
skipping to change at line 21 skipping to change at line 21
* 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
* Lesser General Public License for more details. * Lesser 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
*/ */
#ifndef __TELEPATHY_CONSTANTS_H__ #ifndef __LIBTELEPATHY_CONSTANTS_H__
#define __TELEPATHY_CONSTANTS_H__ #define __LIBTELEPATHY_CONSTANTS_H__
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#include <libtelepathy/_gen-tp-constants.h> #include <telepathy-glib/enums.h>
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#include <libtelepathy/_gen-tp-constants-deprecated.h>
/* Fixup for libtelepathy conventions differing from telepathy-glib */ /* Fixup for libtelepathy conventions differing from telepathy-glib */
#include <libtelepathy/_gen-tp-constants-aliases.h> #include <libtelepathy/_gen-tp-constants-whitelist-aliases.h>
#include <libtelepathy/_gen-tp-constants-deprecated-aliases.h>
/* Fixup for bits of libtelepathy that didn't follow convention */ /* Fixup for bits of libtelepathy that didn't follow convention */
/* handle type is officially no longer called "connection handle type" */ /* handle type is officially no longer called "connection handle type" */
#define TP_CONN_HANDLE_TYPE_NONE TP_HANDLE_TYPE_NONE #define TP_CONN_HANDLE_TYPE_NONE TP_HANDLE_TYPE_NONE
#define TP_CONN_HANDLE_TYPE_CONTACT TP_HANDLE_TYPE_CONTACT #define TP_CONN_HANDLE_TYPE_CONTACT TP_HANDLE_TYPE_CONTACT
#define TP_CONN_HANDLE_TYPE_ROOM TP_HANDLE_TYPE_ROOM #define TP_CONN_HANDLE_TYPE_ROOM TP_HANDLE_TYPE_ROOM
#define TP_CONN_HANDLE_TYPE_LIST TP_HANDLE_TYPE_LIST #define TP_CONN_HANDLE_TYPE_LIST TP_HANDLE_TYPE_LIST
#define TP_CONN_HANDLE_TYPE_GROUP TP_HANDLE_TYPE_GROUP #define TP_CONN_HANDLE_TYPE_GROUP TP_HANDLE_TYPE_GROUP
#define LAST_TP_CONN_HANDLE_TYPE LAST_TP_HANDLE_TYPE #define LAST_TP_CONN_HANDLE_TYPE LAST_TP_HANDLE_TYPE
 End of changes. 4 change blocks. 
4 lines changed or deleted 6 lines changed or added


 tp-helpers.h   tp-helpers.h 
skipping to change at line 22 skipping to change at line 22
* 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
* Lesser General Public License for more details. * Lesser 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
*/ */
#ifndef __TELEPATHY_HELPERS_H__ #ifndef __LIBTELEPATHY_HELPERS_H__
#define __TELEPATHY_HELPERS_H__ #define __LIBTELEPATHY_HELPERS_H__
#include <glib.h> #include <glib.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include "tp-constants.h" #include "tp-constants.h"
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct typedef struct
{ {
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 tp-interfaces.h   tp-interfaces.h 
skipping to change at line 21 skipping to change at line 21
* 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
* Lesser General Public License for more details. * Lesser 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
*/ */
#ifndef __TELEPATHY_INTERFACES_H__ #ifndef __LIBTELEPATHY_INTERFACES_H__
#define __TELEPATHY_INTERFACES_H__ #define __LIBTELEPATHY_INTERFACES_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#include <libtelepathy/_gen-tp-interfaces.h> #include <telepathy-glib/interfaces.h>
/* Deprecated or unstable interfaces */
#include <libtelepathy/_gen-tp-interfaces-deprecated.h>
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#include <libtelepathy/_gen-tp-interfaces-whitelist-aliases.h>
#include <libtelepathy/_gen-tp-interfaces-deprecated-aliases.h>
/* Names that didn't quite follow convention */ /* Names that didn't quite follow convention */
#define TP_IFACE_CHANNEL_INTERFACE TP_IFACE_CHANNEL #define TP_IFACE_CHANNEL_INTERFACE TP_IFACE_CHANNEL
#define TP_IFACE_CONN_INTERFACE TP_IFACE_CONN #define TP_IFACE_CONN_INTERFACE TP_IFACE_CONN
#define TP_IFACE_CONN_MGR_INTERFACE TP_IFACE_CONN_MANAGER #define TP_IFACE_CONN_MGR_INTERFACE TP_IFACE_CONN_MANAGER
#define TP_IFACE_PROPERTIES TP_IFACE_PROPERTIES_INTERFACE #define TP_IFACE_PROPERTIES TP_IFACE_PROPERTIES_INTERFACE
/* Obsolete and omitted from the spec, but kept for source compat */ /* Obsolete and omitted from the spec, but kept for source compat */
#define TP_IFACE_CHANNEL_INTERFACE_SUBJECT \ #define TP_IFACE_CHANNEL_INTERFACE_SUBJECT \
"org.freedesktop.Telepathy.Channel.Interface.Subject" "org.freedesktop.Telepathy.Channel.Interface.Subject"
 End of changes. 3 change blocks. 
3 lines changed or deleted 9 lines changed or added


 tp-props-iface.h   tp-props-iface.h 
skipping to change at line 21 skipping to change at line 21
* 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
* Lesser General Public License for more details. * Lesser 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
*/ */
#ifndef TP_PROPS_IFACE_H #ifndef LIBTELEPATHY_PROPS_IFACE_H
#define TP_PROPS_IFACE_H #define LIBTELEPATHY_PROPS_IFACE_H
#ifndef DBUS_API_SUBJECT_TO_CHANGE #ifndef DBUS_API_SUBJECT_TO_CHANGE
#define DBUS_API_SUBJECT_TO_CHANGE #define DBUS_API_SUBJECT_TO_CHANGE
#endif #endif
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include "tp-constants.h" #include "tp-constants.h"
#include "tp-interfaces.h" #include "tp-interfaces.h"
#include "tp-props-iface-gen.h" #include "tp-props-iface-gen.h"
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 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/