aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-06-08 17:43:59 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-06-08 17:43:59 +0800
commitf63939a4648a0ebd64a2ff1468a72036adadb581 (patch)
treed549cc40eca75394d8654c62f3434bd157fe147e /libempathy
parenta5656bd2eb7a3ff272726e898a0a81462eb438fa (diff)
parenteaf1ecca8c31263cef90bfbb4839e7114719eed8 (diff)
downloadgsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar
gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar.gz
gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar.bz2
gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar.lz
gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar.xz
gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.tar.zst
gsoc2013-empathy-f63939a4648a0ebd64a2ff1468a72036adadb581.zip
Merge branch 'sms-651242'
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-chat.c76
-rw-r--r--libempathy/empathy-tp-chat.h2
2 files changed, 0 insertions, 78 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 02bdc80e3..5d4ce26f7 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -54,8 +54,6 @@ struct _EmpathyTpChatPrivate {
* (channel doesn't implement the Password interface) */
gboolean got_password_flags;
gboolean can_upgrade_to_muc;
- gboolean got_sms_channel;
- gboolean sms_channel;
GHashTable *messages_being_sent;
@@ -70,7 +68,6 @@ enum {
PROP_ACCOUNT,
PROP_REMOTE_CONTACT,
PROP_PASSWORD_NEEDED,
- PROP_SMS_CHANNEL,
PROP_N_MESSAGES_SENDING,
};
@@ -872,9 +869,6 @@ check_almost_ready (EmpathyTpChat *self)
if (!self->priv->got_password_flags)
return;
- if (!self->priv->got_sms_channel)
- return;
-
/* We need either the members (room) or the remote contact (private chat).
* If the chat is protected by a password we can't get these information so
* consider the chat as ready so it can be presented to the user. */
@@ -1265,41 +1259,6 @@ got_password_flags_cb (TpChannel *proxy,
}
static void
-sms_channel_changed_cb (TpChannel *channel,
- gboolean sms_channel,
- gpointer user_data,
- GObject *chat)
-{
- EmpathyTpChat *self = (EmpathyTpChat *) chat;
-
- self->priv->sms_channel = sms_channel;
-
- g_object_notify (G_OBJECT (chat), "sms-channel");
-}
-
-static void
-get_sms_channel_cb (TpProxy *channel,
- const GValue *value,
- const GError *in_error,
- gpointer user_data,
- GObject *chat)
-{
- EmpathyTpChat *self = (EmpathyTpChat *) chat;
-
- if (in_error != NULL) {
- DEBUG ("Failed to get SMSChannel: %s", in_error->message);
- return;
- }
-
- g_return_if_fail (G_VALUE_HOLDS_BOOLEAN (value));
-
- self->priv->sms_channel = g_value_get_boolean (value);
- self->priv->got_sms_channel = TRUE;
-
- check_almost_ready (EMPATHY_TP_CHAT (chat));
-}
-
-static void
tp_chat_get_property (GObject *object,
guint param_id,
GValue *value,
@@ -1317,9 +1276,6 @@ tp_chat_get_property (GObject *object,
case PROP_PASSWORD_NEEDED:
g_value_set_boolean (value, empathy_tp_chat_password_needed (self));
break;
- case PROP_SMS_CHANNEL:
- g_value_set_boolean (value, self->priv->sms_channel);
- break;
case PROP_N_MESSAGES_SENDING:
g_value_set_uint (value,
g_hash_table_size (self->priv->messages_being_sent));
@@ -1414,14 +1370,6 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
G_PARAM_READABLE));
g_object_class_install_property (object_class,
- PROP_SMS_CHANNEL,
- g_param_spec_boolean ("sms-channel",
- "SMS Channel",
- "TRUE if channel is for sending SMSes",
- FALSE,
- G_PARAM_READABLE));
-
- g_object_class_install_property (object_class,
PROP_N_MESSAGES_SENDING,
g_param_spec_uint ("n-messages-sending",
"Num Messages Sending",
@@ -1805,15 +1753,6 @@ empathy_tp_chat_get_self_contact (EmpathyTpChat *self)
return self->priv->user;
}
-
-gboolean
-empathy_tp_chat_is_sms_channel (EmpathyTpChat *self)
-{
- g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), FALSE);
-
- return self->priv->sms_channel;
-}
-
GQuark
empathy_tp_chat_get_feature_ready (void)
{
@@ -1926,21 +1865,6 @@ conn_prepared_cb (GObject *source,
/* No Password interface, so no need to fetch the password flags */
self->priv->got_password_flags = TRUE;
}
-
- /* Check if the chat is for SMS */
- if (tp_proxy_has_interface_by_id (channel,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS)) {
- tp_cli_channel_interface_sms_connect_to_sms_channel_changed (
- channel,
- sms_channel_changed_cb, self, NULL, G_OBJECT (self), NULL);
-
- tp_cli_dbus_properties_call_get (channel, -1,
- TP_IFACE_CHANNEL_INTERFACE_SMS, "SMSChannel",
- get_sms_channel_cb, self, NULL, G_OBJECT (self));
- } else {
- /* if there's no SMS support, then we're not waiting for it */
- self->priv->got_sms_channel = TRUE;
- }
}
static void
diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index de55c1a8c..20ba02a68 100644
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -121,8 +121,6 @@ TpChannelChatState
EmpathyContact * empathy_tp_chat_get_self_contact (EmpathyTpChat *self);
-gboolean empathy_tp_chat_is_sms_channel (EmpathyTpChat *chat);
-
G_END_DECLS
#endif /* __EMPATHY_TP_CHAT_H__ */