#include <libtelepathy/tp-chan-iface-chat-state-gen.h>
#include <libtelepathy/tp-conn.h>
#include <libtelepathy/tp-helpers.h>
+#include <libtelepathy/tp-props-iface.h>
#include "empathy-tp-chat.h"
#include "empathy-contact-manager.h"
#include "empathy-tp-contact-list.h"
#include "empathy-marshal.h"
-#include "gossip-debug.h"
-#include "gossip-time.h"
-#include "gossip-utils.h"
+#include "empathy-debug.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
EMPATHY_TYPE_TP_CHAT, EmpathyTpChatPriv))
MissionControl *mc;
TpChan *tp_chan;
+ DBusGProxy *props_iface;
DBusGProxy *text_iface;
DBusGProxy *chat_state_iface;
};
-static void empathy_tp_chat_class_init (EmpathyTpChatClass *klass);
-static void empathy_tp_chat_init (EmpathyTpChat *chat);
-static void tp_chat_finalize (GObject *object);
-static GObject * tp_chat_constructor (GType type,
- guint n_props,
- GObjectConstructParam *props);
-static void tp_chat_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec);
-static void tp_chat_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec);
-static void tp_chat_destroy_cb (TpChan *text_chan,
- EmpathyTpChat *chat);
-static void tp_chat_closed_cb (TpChan *text_chan,
- EmpathyTpChat *chat);
-static void tp_chat_received_cb (DBusGProxy *text_iface,
- guint message_id,
- guint timestamp,
- guint from_handle,
- guint message_type,
- guint message_flags,
- gchar *message_body,
- EmpathyTpChat *chat);
-static void tp_chat_sent_cb (DBusGProxy *text_iface,
- guint timestamp,
- guint message_type,
- gchar *message_body,
- EmpathyTpChat *chat);
-static void tp_chat_state_changed_cb (DBusGProxy *chat_state_iface,
- guint handle,
- TelepathyChannelChatState state,
- EmpathyTpChat *chat);
-static void tp_chat_emit_message (EmpathyTpChat *chat,
- guint type,
- guint timestamp,
- guint from_handle,
- const gchar *message_body);
+static void empathy_tp_chat_class_init (EmpathyTpChatClass *klass);
+static void empathy_tp_chat_init (EmpathyTpChat *chat);
+static void tp_chat_finalize (GObject *object);
+static GObject * tp_chat_constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *props);
+static void tp_chat_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void tp_chat_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void tp_chat_destroy_cb (TpChan *text_chan,
+ EmpathyTpChat *chat);
+static void tp_chat_closed_cb (TpChan *text_chan,
+ EmpathyTpChat *chat);
+static void tp_chat_received_cb (DBusGProxy *text_iface,
+ guint message_id,
+ guint timestamp,
+ guint from_handle,
+ guint message_type,
+ guint message_flags,
+ gchar *message_body,
+ EmpathyTpChat *chat);
+static void tp_chat_sent_cb (DBusGProxy *text_iface,
+ guint timestamp,
+ guint message_type,
+ gchar *message_body,
+ EmpathyTpChat *chat);
+static void tp_chat_state_changed_cb (DBusGProxy *chat_state_iface,
+ guint handle,
+ TelepathyChannelChatState state,
+ EmpathyTpChat *chat);
+static void tp_chat_emit_message (EmpathyTpChat *chat,
+ guint type,
+ guint timestamp,
+ guint from_handle,
+ const gchar *message_body);
+static void tp_chat_properties_ready_cb (TpPropsIface *props_iface,
+ EmpathyTpChat *chat);
+static void tp_chat_properties_changed_cb (TpPropsIface *props_iface,
+ guint prop_id,
+ TpPropsChanged flag,
+ EmpathyTpChat *chat);
enum {
PROP_0,
PROP_ACCOUNT,
- PROP_TP_CHAN
+ PROP_TP_CHAN,
+
+ PROP_ANONYMOUS,
+ PROP_INVITE_ONLY,
+ PROP_LIMIT,
+ PROP_LIMITED,
+ PROP_MODERATED,
+ PROP_NAME,
+ PROP_DESCRIPTION,
+ PROP_PASSWORD,
+ PROP_PASSWORD_REQUIRED,
+ PROP_PERSISTENT,
+ PROP_PRIVATE,
+ PROP_SUBJECT,
+ PROP_SUBJECT_CONTACT,
+ PROP_SUBJECT_TIMESTAMP
};
enum {
object_class->get_property = tp_chat_get_property;
object_class->set_property = tp_chat_set_property;
+ /* Construct-only properties */
g_object_class_install_property (object_class,
PROP_ACCOUNT,
g_param_spec_object ("account",
MC_TYPE_ACCOUNT,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
-
g_object_class_install_property (object_class,
PROP_TP_CHAN,
g_param_spec_object ("tp-chan",
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
+ /* Properties of Text Channel */
+ g_object_class_install_property (object_class,
+ PROP_ANONYMOUS,
+ g_param_spec_boolean ("anonymous",
+ "anonymous",
+ "anonymous",
+ FALSE,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_INVITE_ONLY,
+ g_param_spec_boolean ("invite-only",
+ "invite-only",
+ "invite-only",
+ FALSE,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_LIMIT,
+ g_param_spec_uint ("limit",
+ "limit",
+ "limit",
+ 0,
+ G_MAXUINT,
+ 0,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_LIMITED,
+ g_param_spec_boolean ("limited",
+ "limited",
+ "limited",
+ FALSE,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_MODERATED,
+ g_param_spec_boolean ("moderated",
+ "moderated",
+ "moderated",
+ FALSE,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_NAME,
+ g_param_spec_string ("name",
+ "name",
+ "name",
+ NULL,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_DESCRIPTION,
+ g_param_spec_string ("description",
+ "description",
+ "description",
+ NULL,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_PASSWORD,
+ g_param_spec_string ("password",
+ "password",
+ "password",
+ NULL,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_PASSWORD_REQUIRED,
+ g_param_spec_boolean ("password-required",
+ "password-required",
+ "password-required",
+ FALSE,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_PERSISTENT,
+ g_param_spec_boolean ("persistent",
+ "persistent",
+ "persistent",
+ FALSE,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_PRIVATE,
+ g_param_spec_boolean ("private",
+ "private",
+ "private"
+ "private",
+ FALSE,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_SUBJECT,
+ g_param_spec_string ("subject",
+ "subject",
+ "subject",
+ NULL,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_SUBJECT_CONTACT,
+ g_param_spec_uint ("subject-contact",
+ "subject-contact",
+ "subject-contact",
+ 0,
+ G_MAXUINT,
+ 0,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_SUBJECT_TIMESTAMP,
+ g_param_spec_uint ("subject-timestamp",
+ "subject-timestamp",
+ "subject-timestamp",
+ 0,
+ G_MAXUINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ /* Signals */
signals[MESSAGE_RECEIVED] =
g_signal_new ("message-received",
G_TYPE_FROM_CLASS (klass),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
- 1, GOSSIP_TYPE_MESSAGE);
+ 1, EMPATHY_TYPE_MESSAGE);
signals[CHAT_STATE_CHANGED] =
g_signal_new ("chat-state-changed",
NULL, NULL,
empathy_marshal_VOID__OBJECT_UINT,
G_TYPE_NONE,
- 2, GOSSIP_TYPE_CONTACT, G_TYPE_UINT);
+ 2, EMPATHY_TYPE_CONTACT, G_TYPE_UINT);
signals[DESTROY] =
g_signal_new ("destroy",
priv = GET_PRIV (chat);
if (priv->tp_chan) {
- gossip_debug (DEBUG_DOMAIN, "Closing channel...");
+ empathy_debug (DEBUG_DOMAIN, "Closing channel...");
g_signal_handlers_disconnect_by_func (priv->tp_chan,
tp_chat_destroy_cb,
object);
if (!tp_chan_close (DBUS_G_PROXY (priv->tp_chan), &error)) {
- gossip_debug (DEBUG_DOMAIN,
+ empathy_debug (DEBUG_DOMAIN,
"Error closing text channel: %s",
error ? error->message : "No error given");
g_clear_error (&error);
chat = G_OBJECT_CLASS (empathy_tp_chat_parent_class)->constructor (type, n_props, props);
priv = GET_PRIV (chat);
-g_print ("**********tp_chat_constructor");
+
priv->manager = empathy_contact_manager_new ();
priv->list = empathy_contact_manager_get_list (priv->manager, priv->account);
- priv->mc = gossip_mission_control_new ();
+ priv->mc = empathy_mission_control_new ();
g_object_ref (priv->list);
priv->text_iface = tp_chan_get_interface (priv->tp_chan,
TELEPATHY_CHAN_IFACE_TEXT_QUARK);
priv->chat_state_iface = tp_chan_get_interface (priv->tp_chan,
TELEPATHY_CHAN_IFACE_CHAT_STATE_QUARK);
+ priv->props_iface = tp_chan_get_interface (priv->tp_chan,
+ TELEPATHY_PROPS_IFACE_QUARK);
g_signal_connect (priv->tp_chan, "destroy",
G_CALLBACK (tp_chat_destroy_cb),
G_CALLBACK (tp_chat_state_changed_cb),
chat, NULL);
}
+ if (priv->props_iface != NULL) {
+ tp_props_iface_set_mapping (TELEPATHY_PROPS_IFACE (priv->props_iface),
+ "anonymous", PROP_ANONYMOUS,
+ "invite-only", PROP_INVITE_ONLY,
+ "limit", PROP_LIMIT,
+ "limited", PROP_LIMITED,
+ "moderated", PROP_MODERATED,
+ "name", PROP_NAME,
+ "description", PROP_DESCRIPTION,
+ "password", PROP_PASSWORD,
+ "password-required", PROP_PASSWORD_REQUIRED,
+ "persistent", PROP_PERSISTENT,
+ "private", PROP_PRIVATE,
+ "subject", PROP_SUBJECT,
+ "subject-contact", PROP_SUBJECT_CONTACT,
+ "subject-timestamp", PROP_SUBJECT_TIMESTAMP,
+ NULL);
+ g_signal_connect (priv->props_iface, "properties-ready",
+ G_CALLBACK (tp_chat_properties_ready_cb),
+ chat);
+ g_signal_connect (priv->props_iface, "properties-changed",
+ G_CALLBACK (tp_chat_properties_changed_cb),
+ chat);
+ }
return chat;
}
GParamSpec *pspec)
{
EmpathyTpChatPriv *priv;
+ EmpathyTpChat *chat;
priv = GET_PRIV (object);
+ chat = EMPATHY_TP_CHAT (object);
+
+ if (param_id >= PROP_ANONYMOUS &&
+ param_id <= PROP_SUBJECT_TIMESTAMP) {
+ if (priv->props_iface) {
+ tp_props_iface_get_value (TELEPATHY_PROPS_IFACE (priv->props_iface),
+ param_id,
+ value);
+ }
+
+ return;
+ }
switch (param_id) {
case PROP_ACCOUNT:
GParamSpec *pspec)
{
EmpathyTpChatPriv *priv;
+ EmpathyTpChat *chat;
priv = GET_PRIV (object);
+ chat = EMPATHY_TP_CHAT (object);
+
+ if (param_id >= PROP_ANONYMOUS &&
+ param_id <= PROP_SUBJECT_TIMESTAMP) {
+ if (priv->props_iface) {
+ tp_props_iface_set_value (TELEPATHY_PROPS_IFACE (priv->props_iface),
+ param_id,
+ value);
+ }
+
+ return;
+ }
switch (param_id) {
case PROP_ACCOUNT:
}
EmpathyTpChat *
-empathy_tp_chat_new_with_contact (GossipContact *contact)
+empathy_tp_chat_new_with_contact (EmpathyContact *contact)
{
EmpathyTpChat *chat;
MissionControl *mc;
const gchar *bus_name;
guint handle;
- g_return_val_if_fail (GOSSIP_IS_CONTACT (contact), NULL);
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
- mc = gossip_mission_control_new ();
- account = gossip_contact_get_account (contact);
+ mc = empathy_mission_control_new ();
+ account = empathy_contact_get_account (contact);
if (mission_control_get_connection_status (mc, account, NULL) != 0) {
/* The account is not connected, nothing to do. */
tp_conn = mission_control_get_connection (mc, account, NULL);
g_return_val_if_fail (tp_conn != NULL, NULL);
bus_name = dbus_g_proxy_get_bus_name (DBUS_G_PROXY (tp_conn));
- handle = gossip_contact_get_handle (contact);
+ handle = empathy_contact_get_handle (contact);
text_chan = tp_conn_new_channel (tp_get_bus (),
tp_conn,
TRUE,
&messages_list,
&error)) {
- gossip_debug (DEBUG_DOMAIN,
+ empathy_debug (DEBUG_DOMAIN,
"Error retrieving pending messages: %s",
error ? error->message : "No error given");
g_clear_error (&error);
message_flags = g_value_get_uint (g_value_array_get_nth (message_struct, 4));
message_body = g_value_get_string (g_value_array_get_nth (message_struct, 5));
- gossip_debug (DEBUG_DOMAIN, "Message pending: %s", message_body);
+ empathy_debug (DEBUG_DOMAIN, "Message pending: %s", message_body);
tp_chat_emit_message (chat,
message_type,
void
empathy_tp_chat_send (EmpathyTpChat *chat,
- GossipMessage *message)
+ EmpathyMessage *message)
{
EmpathyTpChatPriv *priv;
const gchar *message_body;
- GossipMessageType message_type;
+ EmpathyMessageType message_type;
GError *error = NULL;
g_return_if_fail (EMPATHY_IS_TP_CHAT (chat));
- g_return_if_fail (GOSSIP_IS_MESSAGE (message));
+ g_return_if_fail (EMPATHY_IS_MESSAGE (message));
priv = GET_PRIV (chat);
- message_body = gossip_message_get_body (message);
- message_type = gossip_message_get_type (message);
+ message_body = empathy_message_get_body (message);
+ message_type = empathy_message_get_type (message);
- gossip_debug (DEBUG_DOMAIN, "Sending message: %s", message_body);
+ empathy_debug (DEBUG_DOMAIN, "Sending message: %s", message_body);
if (!tp_chan_type_text_send (priv->text_iface,
message_type,
message_body,
&error)) {
- gossip_debug (DEBUG_DOMAIN,
+ empathy_debug (DEBUG_DOMAIN,
"Send Error: %s",
error ? error->message : "No error given");
g_clear_error (&error);
priv = GET_PRIV (chat);
if (priv->chat_state_iface) {
- gossip_debug (DEBUG_DOMAIN, "Set state: %d", state);
+ empathy_debug (DEBUG_DOMAIN, "Set state: %d", state);
if (!tp_chan_iface_chat_state_set_chat_state (priv->chat_state_iface,
state,
&error)) {
- gossip_debug (DEBUG_DOMAIN,
+ empathy_debug (DEBUG_DOMAIN,
"Set Chat State Error: %s",
error ? error->message : "No error given");
g_clear_error (&error);
return priv->id;
}
- priv->id = empathy_tp_chat_build_id (priv->account, priv->tp_chan);
+ priv->id = empathy_get_channel_id (priv->account, priv->tp_chan);
return priv->id;
}
-gchar *
-empathy_tp_chat_build_id (McAccount *account,
- TpChan *tp_chan)
-{
- MissionControl *mc;
- TpConn *tp_conn;
- GArray *handles;
- gchar **names;
- gchar *id;
- GError *error = NULL;
-
- g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
- g_return_val_if_fail (TELEPATHY_IS_CHAN (tp_chan), NULL);
-
- mc = gossip_mission_control_new ();
- tp_conn = mission_control_get_connection (mc, account, NULL);
- g_object_unref (mc);
-
- handles = g_array_new (FALSE, FALSE, sizeof (guint));
- g_array_append_val (handles, tp_chan->handle);
- if (!tp_conn_inspect_handles (DBUS_G_PROXY (tp_conn),
- tp_chan->handle_type,
- handles,
- &names,
- &error)) {
- gossip_debug (DEBUG_DOMAIN,
- "Couldn't get id: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- g_array_free (handles, TRUE);
- g_object_unref (tp_conn);
-
- return NULL;
- }
-
- /* A handle name is unique only for a specific account */
- id = g_strdup_printf ("%s/%s",
- mc_account_get_unique_name (account),
- *names);
-
- g_strfreev (names);
- g_object_unref (tp_conn);
-
- return id;
-}
-
static void
tp_chat_destroy_cb (TpChan *text_chan,
EmpathyTpChat *chat)
priv = GET_PRIV (chat);
- gossip_debug (DEBUG_DOMAIN, "Channel Closed or CM crashed");
+ empathy_debug (DEBUG_DOMAIN, "Channel Closed or CM crashed");
g_object_unref (priv->tp_chan);
priv->tp_chan = NULL;
priv->text_iface = NULL;
priv->chat_state_iface = NULL;
+ priv->props_iface = NULL;
g_signal_emit (chat, signals[DESTROY], 0);
}
priv = GET_PRIV (chat);
- gossip_debug (DEBUG_DOMAIN, "Message received: %s", message_body);
+ empathy_debug (DEBUG_DOMAIN, "Message received: %s", message_body);
tp_chat_emit_message (chat,
message_type,
gchar *message_body,
EmpathyTpChat *chat)
{
- gossip_debug (DEBUG_DOMAIN, "Message sent: %s", message_body);
+ empathy_debug (DEBUG_DOMAIN, "Message sent: %s", message_body);
tp_chat_emit_message (chat,
message_type,
EmpathyTpChat *chat)
{
EmpathyTpChatPriv *priv;
- GossipContact *contact;
+ EmpathyContact *contact;
priv = GET_PRIV (chat);
contact = empathy_tp_contact_list_get_from_handle (priv->list, handle);
- gossip_debug (DEBUG_DOMAIN, "Chat state changed for %s (%d): %d",
- gossip_contact_get_name (contact),
+ empathy_debug (DEBUG_DOMAIN, "Chat state changed for %s (%d): %d",
+ empathy_contact_get_name (contact),
handle,
state);
const gchar *message_body)
{
EmpathyTpChatPriv *priv;
- GossipMessage *message;
- GossipContact *sender;
+ EmpathyMessage *message;
+ EmpathyContact *sender;
+ EmpathyContact *receiver;
priv = GET_PRIV (chat);
+ receiver = empathy_tp_contact_list_get_user (priv->list);
if (from_handle == 0) {
- sender = empathy_tp_contact_list_get_user (priv->list);
- g_object_ref (sender);
+ sender = g_object_ref (receiver);
} else {
sender = empathy_tp_contact_list_get_from_handle (priv->list,
from_handle);
}
- message = gossip_message_new (message_body);
- gossip_message_set_type (message, type);
- gossip_message_set_sender (message, sender);
- gossip_message_set_timestamp (message, (GossipTime) timestamp);
+ message = empathy_message_new (message_body);
+ empathy_message_set_type (message, type);
+ empathy_message_set_sender (message, sender);
+ empathy_message_set_receiver (message, receiver);
+ empathy_message_set_timestamp (message, (EmpathyTime) timestamp);
g_signal_emit (chat, signals[MESSAGE_RECEIVED], 0, message);
g_object_unref (sender);
}
+static void
+tp_chat_properties_ready_cb (TpPropsIface *props_iface,
+ EmpathyTpChat *chat)
+{
+ g_object_notify (G_OBJECT (chat), "anonymous");
+ g_object_notify (G_OBJECT (chat), "invite-only");
+ g_object_notify (G_OBJECT (chat), "limit");
+ g_object_notify (G_OBJECT (chat), "limited");
+ g_object_notify (G_OBJECT (chat), "moderated");
+ g_object_notify (G_OBJECT (chat), "name");
+ g_object_notify (G_OBJECT (chat), "description");
+ g_object_notify (G_OBJECT (chat), "password");
+ g_object_notify (G_OBJECT (chat), "password-required");
+ g_object_notify (G_OBJECT (chat), "persistent");
+ g_object_notify (G_OBJECT (chat), "private");
+ g_object_notify (G_OBJECT (chat), "subject");
+ g_object_notify (G_OBJECT (chat), "subject-contact");
+ g_object_notify (G_OBJECT (chat), "subject-timestamp");
+}
+
+static void
+tp_chat_properties_changed_cb (TpPropsIface *props_iface,
+ guint prop_id,
+ TpPropsChanged flag,
+ EmpathyTpChat *chat)
+{
+ switch (prop_id) {
+ case PROP_ANONYMOUS:
+ g_object_notify (G_OBJECT (chat), "anonymous");
+ break;
+ case PROP_INVITE_ONLY:
+ g_object_notify (G_OBJECT (chat), "invite-only");
+ break;
+ case PROP_LIMIT:
+ g_object_notify (G_OBJECT (chat), "limit");
+ break;
+ case PROP_LIMITED:
+ g_object_notify (G_OBJECT (chat), "limited");
+ break;
+ case PROP_MODERATED:
+ g_object_notify (G_OBJECT (chat), "moderated");
+ break;
+ case PROP_NAME:
+ g_object_notify (G_OBJECT (chat), "name");
+ break;
+ case PROP_DESCRIPTION:
+ g_object_notify (G_OBJECT (chat), "description");
+ break;
+ case PROP_PASSWORD:
+ g_object_notify (G_OBJECT (chat), "password");
+ break;
+ case PROP_PASSWORD_REQUIRED:
+ g_object_notify (G_OBJECT (chat), "password-required");
+ break;
+ case PROP_PERSISTENT:
+ g_object_notify (G_OBJECT (chat), "persistent");
+ break;
+ case PROP_PRIVATE:
+ g_object_notify (G_OBJECT (chat), "private");
+ break;
+ case PROP_SUBJECT:
+ g_object_notify (G_OBJECT (chat), "subject");
+ break;
+ case PROP_SUBJECT_CONTACT:
+ g_object_notify (G_OBJECT (chat), "subject-contact");
+ break;
+ case PROP_SUBJECT_TIMESTAMP:
+ g_object_notify (G_OBJECT (chat), "subject-timestamp");
+ break;
+ }
+}
+
projects / empathy.git / blobdiff