aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-03-11 20:23:00 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-03-11 20:23:00 +0800
commit633dd8bd9ec961c04f73335984d7ea30cc0b5684 (patch)
tree2df8a5783038833eaa689263f7a525f8eeb6d50e
parent1ff9b568baba4d2f3e2445e63f6f68c840b20a88 (diff)
downloadgsoc2013-empathy-633dd8bd9ec961c04f73335984d7ea30cc0b5684.tar
gsoc2013-empathy-633dd8bd9ec961c04f73335984d7ea30cc0b5684.tar.gz
gsoc2013-empathy-633dd8bd9ec961c04f73335984d7ea30cc0b5684.tar.bz2
gsoc2013-empathy-633dd8bd9ec961c04f73335984d7ea30cc0b5684.tar.lz
gsoc2013-empathy-633dd8bd9ec961c04f73335984d7ea30cc0b5684.tar.xz
gsoc2013-empathy-633dd8bd9ec961c04f73335984d7ea30cc0b5684.tar.zst
gsoc2013-empathy-633dd8bd9ec961c04f73335984d7ea30cc0b5684.zip
Continue property stuff
svn path=/trunk/; revision=768
-rw-r--r--libempathy-gtk/empathy-group-chat.c7
-rw-r--r--libempathy/empathy-tp-chat.c86
-rw-r--r--libempathy/empathy-tp-chat.h2
3 files changed, 90 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-group-chat.c b/libempathy-gtk/empathy-group-chat.c
index 16fb841be..008dee81b 100644
--- a/libempathy-gtk/empathy-group-chat.c
+++ b/libempathy-gtk/empathy-group-chat.c
@@ -390,10 +390,15 @@ group_chat_topic_response_cb (GtkWidget *dialog,
if (!G_STR_EMPTY (topic)) {
EmpathyGroupChatPriv *priv;
+ GValue value = {0, };
priv = GET_PRIV (chat);
- empathy_tp_chatroom_set_topic (priv->tp_chat, topic);
+ g_value_init (&value, G_TYPE_STRING);
+ g_value_set_string (&value, topic);
+ empathy_tp_chat_set_property (EMPATHY_TP_CHAT (priv->tp_chat),
+ &value);
+ g_value_unset (&value);
}
}
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 141c20ffe..a7aabca69 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -49,8 +49,15 @@ struct _EmpathyTpChatPriv {
TpChan *tp_chan;
gboolean had_pending_messages;
GSList *message_queue;
+ GPtrArray *properties;
};
+typedef struct {
+ gchar *name;
+ guint id;
+ GValue *value;
+} TpChatProperty;
+
static void empathy_tp_chat_class_init (EmpathyTpChatClass *klass);
static void empathy_tp_chat_init (EmpathyTpChat *chat);
@@ -65,6 +72,7 @@ enum {
MESSAGE_RECEIVED,
SEND_ERROR,
CHAT_STATE_CHANGED,
+ PROPERTY_CHANGED,
DESTROY,
LAST_SIGNAL
};
@@ -375,6 +383,37 @@ tp_chat_properties_changed_cb (TpProxy *proxy,
gpointer user_data,
GObject *chat)
{
+ EmpathyTpChatPriv *priv = GET_PRIV (chat);
+ guint i, j;
+
+ for (i = 0; i < properties->len; i++) {
+ GValueArray *prop_struct;
+ TpChatProperty *property;
+ guint id;
+ GValue *src_value;
+
+ prop_struct = g_ptr_array_index (properties, i);
+ id = g_value_get_uint (g_value_array_get_nth (prop_struct, 0));
+ src_value = g_value_array_get_nth (prop_struct, 1);
+
+ for (j = 0; j < priv->properties->len; j++) {
+ property = g_ptr_array_index (priv->properties, j);
+ if (property->id == id) {
+ if (property->value) {
+ g_value_unset (property->value);
+ } else {
+ property->value = g_slice_new0 (GValue);
+ }
+ g_value_copy (src_value, property->value);
+
+ empathy_debug (DEBUG_DOMAIN, "property %s changed",
+ property->name);
+ g_signal_emit (chat, signals[PROPERTY_CHANGED], 0,
+ property->name, property->value);
+ break;
+ }
+ }
+ }
}
static void
@@ -394,16 +433,26 @@ tp_chat_list_properties_cb (TpProxy *proxy,
gpointer user_data,
GObject *chat)
{
- GArray *ids;
- guint i;
+ EmpathyTpChatPriv *priv = GET_PRIV (chat);
+ GArray *ids;
+ guint i;
ids = g_array_sized_new (FALSE, FALSE, sizeof (guint), properties->len);
+ priv->properties = g_ptr_array_sized_new (properties->len);
for (i = 0; i < properties->len; i++) {
- GValueArray *prop_struct;
- guint id;
+ GValueArray *prop_struct;
+ TpChatProperty *property;
+ guint id;
+ const gchar *name;
prop_struct = g_ptr_array_index (properties, i);
id = g_value_get_uint (g_value_array_get_nth (prop_struct, 0));
+ name = g_value_get_string (g_value_array_get_nth (prop_struct, 1));
+
+ property = g_slice_new0 (TpChatProperty);
+ property->id = id;
+ property->name = g_strdup (name);
+ g_ptr_array_add (priv->properties, property);
g_array_append_val (ids, id);
}
@@ -416,6 +465,13 @@ tp_chat_list_properties_cb (TpProxy *proxy,
g_array_free (ids, TRUE);
}
+void
+empathy_tp_chat_set_property (EmpathyTpChat *chat,
+ const GValue *value)
+{
+ /* FIXME: not implemented */
+}
+
static gboolean
tp_chat_channel_ready_cb (EmpathyTpChat *chat)
{
@@ -466,6 +522,7 @@ static void
tp_chat_finalize (GObject *object)
{
EmpathyTpChatPriv *priv = GET_PRIV (object);
+ guint i;
if (priv->acknowledge && priv->channel) {
empathy_debug (DEBUG_DOMAIN, "Closing channel...");
@@ -485,6 +542,17 @@ tp_chat_finalize (GObject *object)
g_object_unref (priv->tp_chan);
}
+ for (i = 0; i < priv->properties->len; i++) {
+ TpChatProperty *property;
+
+ property = g_ptr_array_index (priv->properties, i);
+ g_free (property->name);
+ g_value_unset (property->value);
+ g_slice_free (GValue, property->value);
+ g_slice_free (TpChatProperty, property);
+ }
+ g_ptr_array_free (priv->properties, TRUE);
+
g_object_unref (priv->factory);
g_object_unref (priv->user);
g_object_unref (priv->account);
@@ -645,6 +713,16 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
G_TYPE_NONE,
2, EMPATHY_TYPE_CONTACT, G_TYPE_UINT);
+ signals[PROPERTY_CHANGED] =
+ g_signal_new ("property-changed",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ _empathy_marshal_VOID__STRING_BOXED,
+ G_TYPE_NONE,
+ 2, G_TYPE_STRING, G_TYPE_VALUE);
+
signals[DESTROY] =
g_signal_new ("destroy",
G_TYPE_FROM_CLASS (klass),
diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index 43acca726..fd988ec2e 100644
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -68,6 +68,8 @@ void empathy_tp_chat_send (EmpathyTpChat *chat,
void empathy_tp_chat_set_state (EmpathyTpChat *chat,
TpChannelChatState state);
const gchar * empathy_tp_chat_get_id (EmpathyTpChat *chat);
+void empathy_tp_chat_set_property (EmpathyTpChat *chat,
+ const GValue *value);
G_END_DECLS