summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b68b95e)
svn path=/trunk/; revision=638
"Contact Capabilities",
"Capabilities of the contact",
EMPATHY_TYPE_CAPABILITIES,
"Contact Capabilities",
"Capabilities of the contact",
EMPATHY_TYPE_CAPABILITIES,
+ EMPATHY_CAPABILITIES_UNKNOWN,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
static void
empathy_contact_init (EmpathyContact *contact)
{
static void
empathy_contact_init (EmpathyContact *contact)
{
- EmpathyContactPriv *priv;
-
- priv = GET_PRIV (contact);
- priv->capabilities = EMPATHY_CAPABILITIES_UNKNOWN;
static void
tp_call_request_streams_capabilities_cb (EmpathyContact *contact,
static void
tp_call_request_streams_capabilities_cb (EmpathyContact *contact,
- GParamSpec *property, gpointer user_data)
+ GParamSpec *property,
+ gpointer user_data)
{
EmpathyTpCall *call = EMPATHY_TP_CALL (user_data);
g_signal_handlers_disconnect_by_func (contact,
{
EmpathyTpCall *call = EMPATHY_TP_CALL (user_data);
g_signal_handlers_disconnect_by_func (contact,
- tp_call_request_streams_capabilities_cb,
- user_data);
+ tp_call_request_streams_capabilities_cb,
+ user_data);
tp_call_request_streams_for_capabilities (call,
empathy_contact_get_capabilities (contact));
tp_call_request_streams_for_capabilities (call,
empathy_contact_get_capabilities (contact));
else
{
capabilities = empathy_contact_get_capabilities (priv->contact);
else
{
capabilities = empathy_contact_get_capabilities (priv->contact);
- if (capabilities == EMPATHY_CAPABILITIES_UNKNOWN) {
- g_signal_connect (G_OBJECT (priv->contact), "notify::capabilities",
- G_CALLBACK (tp_call_request_streams_capabilities_cb), call);
- return;
- }
+ if (capabilities == EMPATHY_CAPABILITIES_UNKNOWN)
+ {
+ g_signal_connect (priv->contact, "notify::capabilities",
+ G_CALLBACK (tp_call_request_streams_capabilities_cb), call);
+ return;
+ }
}
tp_call_request_streams_for_capabilities (call, capabilities);
}
tp_call_request_streams_for_capabilities (call, capabilities);
capabilities = empathy_contact_get_capabilities (contact);
if (strcmp (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) == 0) {
capabilities = empathy_contact_get_capabilities (contact);
if (strcmp (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) == 0) {
- capabilities = EMPATHY_CAPABILITIES_NONE;
+ capabilities &= ~EMPATHY_CAPABILITIES_AUDIO;
+ capabilities &= ~EMPATHY_CAPABILITIES_VIDEO;
if (specific & TP_CHANNEL_MEDIA_CAPABILITY_AUDIO) {
capabilities |= EMPATHY_CAPABILITIES_AUDIO;
}
if (specific & TP_CHANNEL_MEDIA_CAPABILITY_AUDIO) {
capabilities |= EMPATHY_CAPABILITIES_AUDIO;
}
if (error) {
empathy_debug (DEBUG_DOMAIN, "Error getting capabilities: %s",
if (error) {
empathy_debug (DEBUG_DOMAIN, "Error getting capabilities: %s",
/* FIXME Should set the capabilities of the contacts for which this request
* originated to NONE */
goto OUT;
/* FIXME Should set the capabilities of the contacts for which this request
* originated to NONE */
goto OUT;