aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-11-12 22:18:06 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-05-25 15:22:40 +0800
commit935c16f4738604f3738d02b9be7a25cd2b49988a (patch)
tree7a6370259dafceee2c95f9c5c4a320dbf4ff5a24
parent1a8f17fcac3c6f9bae7c358ab5222c2dabdb31d3 (diff)
downloadgsoc2013-empathy-935c16f4738604f3738d02b9be7a25cd2b49988a.tar
gsoc2013-empathy-935c16f4738604f3738d02b9be7a25cd2b49988a.tar.gz
gsoc2013-empathy-935c16f4738604f3738d02b9be7a25cd2b49988a.tar.bz2
gsoc2013-empathy-935c16f4738604f3738d02b9be7a25cd2b49988a.tar.lz
gsoc2013-empathy-935c16f4738604f3738d02b9be7a25cd2b49988a.tar.xz
gsoc2013-empathy-935c16f4738604f3738d02b9be7a25cd2b49988a.tar.zst
gsoc2013-empathy-935c16f4738604f3738d02b9be7a25cd2b49988a.zip
tp-chat: rename chat-state-changed to chat-state-changed-empathy
chat-state-changed already exists in TpChannel and we can't redefine it.
-rw-r--r--libempathy-gtk/empathy-chat.c2
-rw-r--r--libempathy/empathy-tp-chat.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 79411e74d..9ec348047 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -3669,7 +3669,7 @@ empathy_chat_set_tp_chat (EmpathyChat *chat,
g_signal_connect (tp_chat, "send-error",
G_CALLBACK (chat_send_error_cb),
chat);
- g_signal_connect (tp_chat, "chat-state-changed",
+ g_signal_connect (tp_chat, "chat-state-changed-empathy",
G_CALLBACK (chat_state_changed_cb),
chat);
g_signal_connect (tp_chat, "property-changed",
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 0541943b9..1fb621650 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1637,7 +1637,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
3, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING);
signals[CHAT_STATE_CHANGED] =
- g_signal_new ("chat-state-changed",
+ g_signal_new ("chat-state-changed-empathy",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,