account-manager.h   account-manager.h 
skipping to change at line 110 skipping to change at line 110
GAsyncReadyCallback callback, gpointer user_data); GAsyncReadyCallback callback, gpointer user_data);
TpAccount * tp_account_manager_create_account_finish ( TpAccount * tp_account_manager_create_account_finish (
TpAccountManager *manager, GAsyncResult *result, GError **error) TpAccountManager *manager, GAsyncResult *result, GError **error)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
gboolean tp_account_manager_is_prepared (TpAccountManager *manager, gboolean tp_account_manager_is_prepared (TpAccountManager *manager,
GQuark feature); GQuark feature);
void tp_account_manager_prepare_async (TpAccountManager *manager, void tp_account_manager_prepare_async (TpAccountManager *manager,
const GQuark *features, GAsyncReadyCallback callback, gpointer user_dat const GQuark *features,
a); GAsyncReadyCallback callback,
gpointer user_data) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async);
gboolean tp_account_manager_prepare_finish (TpAccountManager *manager, gboolean tp_account_manager_prepare_finish (TpAccountManager *manager,
GAsyncResult *result, GError **error); GAsyncResult *result,
GError **error) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_finish);
void tp_account_manager_enable_restart (TpAccountManager *manager); void tp_account_manager_enable_restart (TpAccountManager *manager);
G_END_DECLS G_END_DECLS
#include <telepathy-glib/_gen/tp-cli-account-manager.h> #include <telepathy-glib/_gen/tp-cli-account-manager.h>
#endif #endif
 End of changes. 2 change blocks. 
3 lines changed or deleted 5 lines changed or added


 account.h   account.h 
skipping to change at line 217 skipping to change at line 217
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
void tp_account_get_avatar_async (TpAccount *account, void tp_account_get_avatar_async (TpAccount *account,
GAsyncReadyCallback callback, gpointer user_data); GAsyncReadyCallback callback, gpointer user_data);
const GArray *tp_account_get_avatar_finish (TpAccount *account, const GArray *tp_account_get_avatar_finish (TpAccount *account,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
gboolean tp_account_is_prepared (TpAccount *account, GQuark feature); gboolean tp_account_is_prepared (TpAccount *account, GQuark feature);
void tp_account_prepare_async (TpAccount *account, const GQuark *features, void tp_account_prepare_async (TpAccount *account,
GAsyncReadyCallback callback, gpointer user_data); const GQuark *features,
GAsyncReadyCallback callback,
gpointer user_data) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async);
gboolean tp_account_prepare_finish (TpAccount *account, GAsyncResult *resul gboolean tp_account_prepare_finish (TpAccount *account,
t, GAsyncResult *result,
GError **error); GError **error) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_finish);
void tp_account_set_avatar_async (TpAccount *self, void tp_account_set_avatar_async (TpAccount *self,
const guchar *avatar, const guchar *avatar,
gsize len, gsize len,
const gchar *mime_type, const gchar *mime_type,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_account_set_avatar_finish (TpAccount *self, gboolean tp_account_set_avatar_finish (TpAccount *self,
GAsyncResult *result, GAsyncResult *result,
 End of changes. 2 change blocks. 
5 lines changed or deleted 7 lines changed or added


 automatic-client-factory.h   automatic-client-factory.h 
skipping to change at line 24 skipping to change at line 24
* 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_AUTOMATIC_CLIENT_FACTORY_H__ #ifndef __TP_AUTOMATIC_CLIENT_FACTORY_H__
#define __TP_AUTOMATIC_CLIENT_FACTORY_H__ #define __TP_AUTOMATIC_CLIENT_FACTORY_H__
#include <telepathy-glib/dbus-tube-channel.h>
#include <telepathy-glib/file-transfer-channel.h> #include <telepathy-glib/file-transfer-channel.h>
#include <telepathy-glib/simple-client-factory.h> #include <telepathy-glib/simple-client-factory.h>
#include <telepathy-glib/stream-tube-channel.h> #include <telepathy-glib/stream-tube-channel.h>
#include <telepathy-glib/text-channel.h> #include <telepathy-glib/text-channel.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpAutomaticClientFactory TpAutomaticClientFactory; typedef struct _TpAutomaticClientFactory TpAutomaticClientFactory;
typedef struct _TpAutomaticClientFactoryClass TpAutomaticClientFactoryClass ; typedef struct _TpAutomaticClientFactoryClass TpAutomaticClientFactoryClass ;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 channel.h   channel.h 
skipping to change at line 131 skipping to change at line 131
#define TP_CHANNEL_FEATURE_CORE \ #define TP_CHANNEL_FEATURE_CORE \
tp_channel_get_feature_quark_core () tp_channel_get_feature_quark_core ()
GQuark tp_channel_get_feature_quark_core (void) G_GNUC_CONST; GQuark tp_channel_get_feature_quark_core (void) G_GNUC_CONST;
#define TP_CHANNEL_FEATURE_GROUP \ #define TP_CHANNEL_FEATURE_GROUP \
tp_channel_get_feature_quark_group () tp_channel_get_feature_quark_group ()
GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST; GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST;
#define TP_CHANNEL_FEATURE_CONTACTS \
tp_channel_get_feature_quark_contacts ()
GQuark tp_channel_get_feature_quark_contacts (void) G_GNUC_CONST;
TpContact *tp_channel_get_target_contact (TpChannel *self);
TpContact *tp_channel_get_initiator_contact (TpChannel *self);
TpContact *tp_channel_group_get_self_contact (TpChannel *self);
GPtrArray *tp_channel_group_dup_members_contacts (TpChannel *self);
GPtrArray *tp_channel_group_dup_local_pending_contacts (TpChannel *self);
GPtrArray *tp_channel_group_dup_remote_pending_contacts (TpChannel *self);
gboolean tp_channel_group_get_local_pending_contact_info (TpChannel *self,
TpContact *local_pending, TpContact **actor,
TpChannelGroupChangeReason *reason, const gchar **message);
TpContact *tp_channel_group_get_contact_owner (TpChannel *self,
TpContact *contact);
#define TP_CHANNEL_FEATURE_CHAT_STATES \ #define TP_CHANNEL_FEATURE_CHAT_STATES \
tp_channel_get_feature_quark_chat_states () tp_channel_get_feature_quark_chat_states ()
GQuark tp_channel_get_feature_quark_chat_states (void) G_GNUC_CONST; GQuark tp_channel_get_feature_quark_chat_states (void) G_GNUC_CONST;
TpChannelChatState tp_channel_get_chat_state (TpChannel *self, TpChannelChatState tp_channel_get_chat_state (TpChannel *self,
TpHandle contact); TpHandle contact);
void tp_channel_join_async (TpChannel *self, void tp_channel_join_async (TpChannel *self,
const gchar *message, const gchar *message,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
 End of changes. 1 change blocks. 
0 lines changed or deleted 16 lines changed or added


 dbus-properties-mixin.h   dbus-properties-mixin.h 
skipping to change at line 34 skipping to change at line 34
#include <glib-object.h> #include <glib-object.h>
#include <telepathy-glib/_gen/genums.h> #include <telepathy-glib/_gen/genums.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* ---- Semi-abstract property definition (used in TpSvc*) ---------- */ /* ---- Semi-abstract property definition (used in TpSvc*) ---------- */
typedef enum { /*< flags >*/ typedef enum { /*< flags >*/
TP_DBUS_PROPERTIES_MIXIN_FLAG_READ = 1, TP_DBUS_PROPERTIES_MIXIN_FLAG_READ = 1,
TP_DBUS_PROPERTIES_MIXIN_FLAG_WRITE = 2 TP_DBUS_PROPERTIES_MIXIN_FLAG_WRITE = 2,
TP_DBUS_PROPERTIES_MIXIN_FLAG_EMITS_CHANGED = 4,
TP_DBUS_PROPERTIES_MIXIN_FLAG_EMITS_INVALIDATED = 8
} TpDBusPropertiesMixinFlags; } TpDBusPropertiesMixinFlags;
typedef struct { typedef struct {
GQuark name; GQuark name;
TpDBusPropertiesMixinFlags flags; TpDBusPropertiesMixinFlags flags;
gchar *dbus_signature; gchar *dbus_signature;
GType type; GType type;
/*<private>*/ /*<private>*/
GCallback _1; GCallback _1;
GCallback _2; GCallback _2;
skipping to change at line 136 skipping to change at line 138
const gchar *first_property, ...) const gchar *first_property, ...)
G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT; G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;
void tp_dbus_properties_mixin_fill_properties_hash (GObject *object, void tp_dbus_properties_mixin_fill_properties_hash (GObject *object,
GHashTable *table, GHashTable *table,
const gchar *first_interface, const gchar *first_interface,
const gchar *first_property, const gchar *first_property,
...) ...)
G_GNUC_NULL_TERMINATED; G_GNUC_NULL_TERMINATED;
void tp_dbus_properties_mixin_emit_properties_changed (
GObject *object,
const gchar *interface_name,
const gchar * const *properties);
void tp_dbus_properties_mixin_emit_properties_changed_varargs (
GObject *object,
const gchar *interface_name,
...)
G_GNUC_NULL_TERMINATED;
G_END_DECLS G_END_DECLS
#endif /* #ifndef __TP_DBUS_PROPERTIES_MIXIN_H__ */ #endif /* #ifndef __TP_DBUS_PROPERTIES_MIXIN_H__ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 14 lines changed or added


 dbus.h   dbus.h 
skipping to change at line 56 skipping to change at line 56
gboolean tp_dbus_check_valid_interface_name (const gchar *name, gboolean tp_dbus_check_valid_interface_name (const gchar *name,
GError **error); GError **error);
gboolean tp_dbus_check_valid_member_name (const gchar *name, gboolean tp_dbus_check_valid_member_name (const gchar *name,
GError **error); GError **error);
gboolean tp_dbus_check_valid_object_path (const gchar *path, gboolean tp_dbus_check_valid_object_path (const gchar *path,
GError **error); GError **error);
/* The scanner warns about these, but they're skipped anyway.
* See GNOME bug#656743 */
#ifndef __GI_SCANNER__
GValue *tp_g_value_slice_new_bytes (guint length, gconstpointer bytes) GValue *tp_g_value_slice_new_bytes (guint length, gconstpointer bytes)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_g_value_slice_new_take_bytes (GArray *bytes) GValue *tp_g_value_slice_new_take_bytes (GArray *bytes)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_g_value_slice_new_object_path (const gchar *path) GValue *tp_g_value_slice_new_object_path (const gchar *path)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_g_value_slice_new_static_object_path (const gchar *path) GValue *tp_g_value_slice_new_static_object_path (const gchar *path)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_g_value_slice_new_take_object_path (gchar *path) GValue *tp_g_value_slice_new_take_object_path (gchar *path)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
#endif /* __GI_SCANNER__ */
#define tp_asv_size(asv) _tp_asv_size_inline (asv) #define tp_asv_size(asv) _tp_asv_size_inline (asv)
static inline guint static inline guint
_tp_asv_size_inline (const GHashTable *asv) _tp_asv_size_inline (const GHashTable *asv)
{ {
/* The empty comment here is to stop gtkdoc thinking g_hash_table_size is /* The empty comment here is to stop gtkdoc thinking g_hash_table_size is
* a declaration. */ * a declaration. */
return g_hash_table_size /* */ ((GHashTable *) asv); return g_hash_table_size /* */ ((GHashTable *) asv);
} }
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 error-str.h   error-str.h 
skipping to change at line 34 skipping to change at line 34
#define TP_ERROR_STR_CERT_INSECURE "org.freedesktop.Telepathy.Error.Cert.In secure" #define TP_ERROR_STR_CERT_INSECURE "org.freedesktop.Telepathy.Error.Cert.In secure"
#define TP_ERROR_STR_CERT_INVALID "org.freedesktop.Telepathy.Error.Cert.Inv alid" #define TP_ERROR_STR_CERT_INVALID "org.freedesktop.Telepathy.Error.Cert.Inv alid"
#define TP_ERROR_STR_CERT_LIMIT_EXCEEDED "org.freedesktop.Telepathy.Error.C ert.LimitExceeded" #define TP_ERROR_STR_CERT_LIMIT_EXCEEDED "org.freedesktop.Telepathy.Error.C ert.LimitExceeded"
#define TP_ERROR_STR_NOT_CAPABLE "org.freedesktop.Telepathy.Error.NotCapabl e" #define TP_ERROR_STR_NOT_CAPABLE "org.freedesktop.Telepathy.Error.NotCapabl e"
#define TP_ERROR_STR_OFFLINE "org.freedesktop.Telepathy.Error.Offline" #define TP_ERROR_STR_OFFLINE "org.freedesktop.Telepathy.Error.Offline"
#define TP_ERROR_STR_CHANNEL_KICKED "org.freedesktop.Telepathy.Error.Channe l.Kicked" #define TP_ERROR_STR_CHANNEL_KICKED "org.freedesktop.Telepathy.Error.Channe l.Kicked"
#define TP_ERROR_STR_BUSY "org.freedesktop.Telepathy.Error.Busy" #define TP_ERROR_STR_BUSY "org.freedesktop.Telepathy.Error.Busy"
#define TP_ERROR_STR_NO_ANSWER "org.freedesktop.Telepathy.Error.NoAnswer" #define TP_ERROR_STR_NO_ANSWER "org.freedesktop.Telepathy.Error.NoAnswer"
#define TP_ERROR_STR_DOES_NOT_EXIST "org.freedesktop.Telepathy.Error.DoesNo tExist" #define TP_ERROR_STR_DOES_NOT_EXIST "org.freedesktop.Telepathy.Error.DoesNo tExist"
#define TP_ERROR_STR_TERMINATED "org.freedesktop.Telepathy.Error.Terminated " #define TP_ERROR_STR_TERMINATED "org.freedesktop.Telepathy.Error.Terminated "
#define TP_ERROR_STR_MEDIA_CODECS_INCOMPATIBLE "org.freedesktop.Telepathy.E
rror.Media.CodecsIncompatible"
#define TP_ERROR_STR_MEDIA_UNSUPPORTED_TYPE "org.freedesktop.Telepathy.Erro
r.Media.UnsupportedType"
#define TP_ERROR_STR_MEDIA_STREAMING_ERROR "org.freedesktop.Telepathy.Error
.Media.StreamingError"
#define TP_ERROR_STR_CONNECTION_REFUSED "org.freedesktop.Telepathy.Error.Co nnectionRefused" #define TP_ERROR_STR_CONNECTION_REFUSED "org.freedesktop.Telepathy.Error.Co nnectionRefused"
#define TP_ERROR_STR_CONNECTION_FAILED "org.freedesktop.Telepathy.Error.Con nectionFailed" #define TP_ERROR_STR_CONNECTION_FAILED "org.freedesktop.Telepathy.Error.Con nectionFailed"
#define TP_ERROR_STR_CONNECTION_LOST "org.freedesktop.Telepathy.Error.Conne ctionLost" #define TP_ERROR_STR_CONNECTION_LOST "org.freedesktop.Telepathy.Error.Conne ctionLost"
#define TP_ERROR_STR_ALREADY_CONNECTED "org.freedesktop.Telepathy.Error.Alr eadyConnected" #define TP_ERROR_STR_ALREADY_CONNECTED "org.freedesktop.Telepathy.Error.Alr eadyConnected"
#define TP_ERROR_STR_CONNECTION_REPLACED "org.freedesktop.Telepathy.Error.C onnectionReplaced" #define TP_ERROR_STR_CONNECTION_REPLACED "org.freedesktop.Telepathy.Error.C onnectionReplaced"
#define TP_ERROR_STR_REGISTRATION_EXISTS "org.freedesktop.Telepathy.Error.R egistrationExists" #define TP_ERROR_STR_REGISTRATION_EXISTS "org.freedesktop.Telepathy.Error.R egistrationExists"
#define TP_ERROR_STR_SERVICE_BUSY "org.freedesktop.Telepathy.Error.ServiceB usy" #define TP_ERROR_STR_SERVICE_BUSY "org.freedesktop.Telepathy.Error.ServiceB usy"
#define TP_ERROR_STR_RESOURCE_UNAVAILABLE "org.freedesktop.Telepathy.Error. ResourceUnavailable" #define TP_ERROR_STR_RESOURCE_UNAVAILABLE "org.freedesktop.Telepathy.Error. ResourceUnavailable"
#define TP_ERROR_STR_WOULD_BREAK_ANONYMITY "org.freedesktop.Telepathy.Error .WouldBreakAnonymity" #define TP_ERROR_STR_WOULD_BREAK_ANONYMITY "org.freedesktop.Telepathy.Error .WouldBreakAnonymity"
#define TP_ERROR_STR_NOT_YET "org.freedesktop.Telepathy.Error.NotYet" #define TP_ERROR_STR_NOT_YET "org.freedesktop.Telepathy.Error.NotYet"
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 errors.h   errors.h 
skipping to change at line 93 skipping to change at line 93
TP_ERROR_CERT_INSECURE, /*< nick=Cert.Insecure >*/ TP_ERROR_CERT_INSECURE, /*< nick=Cert.Insecure >*/
TP_ERROR_CERT_LIMIT_EXCEEDED, /*< nick=Cert.LimitExceeded >*/ TP_ERROR_CERT_LIMIT_EXCEEDED, /*< nick=Cert.LimitExceeded >*/
TP_ERROR_NOT_YET, /*< nick=NotYet >*/ TP_ERROR_NOT_YET, /*< nick=NotYet >*/
TP_ERROR_REJECTED, /*< nick=Rejected >*/ TP_ERROR_REJECTED, /*< nick=Rejected >*/
TP_ERROR_PICKED_UP_ELSEWHERE, /*< nick=PickedUpElsewhere >*/ TP_ERROR_PICKED_UP_ELSEWHERE, /*< nick=PickedUpElsewhere >*/
TP_ERROR_CONFUSED, /*< nick=Confused >*/ TP_ERROR_CONFUSED, /*< nick=Confused >*/
TP_ERROR_SERVICE_CONFUSED, /*< nick=ServiceConfused >*/ TP_ERROR_SERVICE_CONFUSED, /*< nick=ServiceConfused >*/
TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED, /*< nick=EmergencyCallsNotSuppo rted >*/ TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED, /*< nick=EmergencyCallsNotSuppo rted >*/
TP_ERROR_SOFTWARE_UPGRADE_REQUIRED, /*< nick=SoftwareUpgradeRequired >* / TP_ERROR_SOFTWARE_UPGRADE_REQUIRED, /*< nick=SoftwareUpgradeRequired >* /
TP_ERROR_INSUFFICIENT_BALANCE, /*< nick=InsufficientBalance >*/ TP_ERROR_INSUFFICIENT_BALANCE, /*< nick=InsufficientBalance >*/
TP_ERROR_MEDIA_CODECS_INCOMPATIBLE, /*< nick=Media.CodecsIncompatible >
*/
TP_ERROR_MEDIA_UNSUPPORTED_TYPE, /*< nick=Media.UnsupportedType >*/
TP_ERROR_MEDIA_STREAMING_ERROR, /*< nick=Media.StreamingError >*/
} TpError; } TpError;
const gchar *tp_error_get_dbus_name (TpError error); const gchar *tp_error_get_dbus_name (TpError error);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 protocol.h   protocol.h 
skipping to change at line 26 skipping to change at line 26
* 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_PROTOCOL_H #ifndef TP_PROTOCOL_H
#define TP_PROTOCOL_H #define TP_PROTOCOL_H
#include <glib-object.h> #include <glib-object.h>
#include <telepathy-glib/capabilities.h> #include <telepathy-glib/capabilities.h>
#include <telepathy-glib/connection.h>
#include <telepathy-glib/proxy.h> #include <telepathy-glib/proxy.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpConnectionManagerParam TpConnectionManagerParam; typedef struct _TpConnectionManagerParam TpConnectionManagerParam;
struct _TpConnectionManagerParam struct _TpConnectionManagerParam
{ {
/*<public>*/ /*<public>*/
gchar *name; gchar *name;
skipping to change at line 105 skipping to change at line 106
#define TP_PROTOCOL_FEATURE_CORE \ #define TP_PROTOCOL_FEATURE_CORE \
(tp_protocol_get_feature_quark_core ()) (tp_protocol_get_feature_quark_core ())
GQuark tp_protocol_get_feature_quark_core (void) G_GNUC_CONST; GQuark tp_protocol_get_feature_quark_core (void) G_GNUC_CONST;
const gchar *tp_protocol_get_vcard_field (TpProtocol *self); const gchar *tp_protocol_get_vcard_field (TpProtocol *self);
const gchar *tp_protocol_get_english_name (TpProtocol *self); const gchar *tp_protocol_get_english_name (TpProtocol *self);
const gchar *tp_protocol_get_icon_name (TpProtocol *self); const gchar *tp_protocol_get_icon_name (TpProtocol *self);
TpCapabilities *tp_protocol_get_capabilities (TpProtocol *self); TpCapabilities *tp_protocol_get_capabilities (TpProtocol *self);
TpAvatarRequirements * tp_protocol_get_avatar_requirements (TpProtocol *sel
f);
G_END_DECLS G_END_DECLS
#include <telepathy-glib/_gen/tp-cli-protocol.h> #include <telepathy-glib/_gen/tp-cli-protocol.h>
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 765 skipping to change at line 765
#define TP_PROP_CHANNEL_INTERFACE_GROUP_MEMBERS \ #define TP_PROP_CHANNEL_INTERFACE_GROUP_MEMBERS \
"org.freedesktop.Telepathy.Channel.Interface.Group.Members" "org.freedesktop.Telepathy.Channel.Interface.Group.Members"
#define TP_PROP_CHANNEL_INTERFACE_GROUP_REMOTE_PENDING_MEMBERS \ #define TP_PROP_CHANNEL_INTERFACE_GROUP_REMOTE_PENDING_MEMBERS \
"org.freedesktop.Telepathy.Channel.Interface.Group.RemotePendingMembers" "org.freedesktop.Telepathy.Channel.Interface.Group.RemotePendingMembers"
#define TP_PROP_CHANNEL_INTERFACE_GROUP_SELF_HANDLE \ #define TP_PROP_CHANNEL_INTERFACE_GROUP_SELF_HANDLE \
"org.freedesktop.Telepathy.Channel.Interface.Group.SelfHandle" "org.freedesktop.Telepathy.Channel.Interface.Group.SelfHandle"
#define TP_PROP_CHANNEL_INTERFACE_GROUP_MEMBER_IDENTIFIERS \
"org.freedesktop.Telepathy.Channel.Interface.Group.MemberIdentifiers"
#define TP_IFACE_CHANNEL_INTERFACE_HOLD \ #define TP_IFACE_CHANNEL_INTERFACE_HOLD \
"org.freedesktop.Telepathy.Channel.Interface.Hold" "org.freedesktop.Telepathy.Channel.Interface.Hold"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD \
(tp_iface_quark_channel_interface_hold ()) (tp_iface_quark_channel_interface_hold ())
GQuark tp_iface_quark_channel_interface_hold (void); GQuark tp_iface_quark_channel_interface_hold (void);
#define TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING \ #define TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING \
"org.freedesktop.Telepathy.Channel.Interface.MediaSignalling" "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling"
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 tp-cli-channel.h   tp-cli-channel.h 
skipping to change at line 298 skipping to change at line 298
GHashTable *arg_Added, GHashTable *arg_Added,
const GArray *arg_Removed, const GArray *arg_Removed,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_handle_o wners_changed (TpChannel *proxy, TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_handle_o wners_changed (TpChannel *proxy,
tp_cli_channel_interface_group_signal_callback_handle_owners_changed ca llback, tp_cli_channel_interface_group_signal_callback_handle_owners_changed ca llback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
typedef void (*tp_cli_channel_interface_group_signal_callback_handle_owners
_changed_detailed) (TpChannel *proxy,
GHashTable *arg_Added,
const GArray *arg_Removed,
GHashTable *arg_Identifiers,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_handle_o
wners_changed_detailed (TpChannel *proxy,
tp_cli_channel_interface_group_signal_callback_handle_owners_changed_de
tailed callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_interface_group_signal_callback_self_handle_c hanged) (TpChannel *proxy, typedef void (*tp_cli_channel_interface_group_signal_callback_self_handle_c hanged) (TpChannel *proxy,
guint arg_Self_Handle, guint arg_Self_Handle,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_self_han dle_changed (TpChannel *proxy, TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_self_han dle_changed (TpChannel *proxy,
tp_cli_channel_interface_group_signal_callback_self_handle_changed call back, tp_cli_channel_interface_group_signal_callback_self_handle_changed call back,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
typedef void (*tp_cli_channel_interface_group_signal_callback_self_contact_
changed) (TpChannel *proxy,
guint arg_Self_Handle,
const gchar *arg_Self_ID,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_self_con
tact_changed (TpChannel *proxy,
tp_cli_channel_interface_group_signal_callback_self_contact_changed cal
lback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_interface_group_signal_callback_group_flags_c hanged) (TpChannel *proxy, typedef void (*tp_cli_channel_interface_group_signal_callback_group_flags_c hanged) (TpChannel *proxy,
guint arg_Added, guint arg_Added,
guint arg_Removed, guint arg_Removed,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_group_fl ags_changed (TpChannel *proxy, TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_group_fl ags_changed (TpChannel *proxy,
tp_cli_channel_interface_group_signal_callback_group_flags_changed call back, tp_cli_channel_interface_group_signal_callback_group_flags_changed call back,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
 End of changes. 2 change blocks. 
0 lines changed or deleted 29 lines changed or added


 tp-svc-channel.h   tp-svc-channel.h 
skipping to change at line 457 skipping to change at line 457
void tp_svc_channel_interface_group_return_from_remove_members_with_reason (DBusGMethodInvocation *context); void tp_svc_channel_interface_group_return_from_remove_members_with_reason (DBusGMethodInvocation *context);
static inline void static inline void
tp_svc_channel_interface_group_return_from_remove_members_with_reason (DBus GMethodInvocation *context) tp_svc_channel_interface_group_return_from_remove_members_with_reason (DBus GMethodInvocation *context)
{ {
dbus_g_method_return (context); dbus_g_method_return (context);
} }
void tp_svc_channel_interface_group_emit_handle_owners_changed (gpointer in stance, void tp_svc_channel_interface_group_emit_handle_owners_changed (gpointer in stance,
GHashTable *arg_Added, GHashTable *arg_Added,
const GArray *arg_Removed); const GArray *arg_Removed);
void tp_svc_channel_interface_group_emit_handle_owners_changed_detailed (gp
ointer instance,
GHashTable *arg_Added,
const GArray *arg_Removed,
GHashTable *arg_Identifiers);
void tp_svc_channel_interface_group_emit_self_handle_changed (gpointer inst ance, void tp_svc_channel_interface_group_emit_self_handle_changed (gpointer inst ance,
guint arg_Self_Handle); guint arg_Self_Handle);
void tp_svc_channel_interface_group_emit_self_contact_changed (gpointer ins
tance,
guint arg_Self_Handle,
const gchar *arg_Self_ID);
void tp_svc_channel_interface_group_emit_group_flags_changed (gpointer inst ance, void tp_svc_channel_interface_group_emit_group_flags_changed (gpointer inst ance,
guint arg_Added, guint arg_Added,
guint arg_Removed); guint arg_Removed);
void tp_svc_channel_interface_group_emit_members_changed (gpointer instance , void tp_svc_channel_interface_group_emit_members_changed (gpointer instance ,
const gchar *arg_Message, const gchar *arg_Message,
const GArray *arg_Added, const GArray *arg_Added,
const GArray *arg_Removed, const GArray *arg_Removed,
const GArray *arg_Local_Pending, const GArray *arg_Local_Pending,
const GArray *arg_Remote_Pending, const GArray *arg_Remote_Pending,
guint arg_Actor, guint arg_Actor,
 End of changes. 2 change blocks. 
0 lines changed or deleted 9 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/