tp-chat: rename chat-state-changed to chat-state-changed-empathy

chat-state-changed already exists in TpChannel and we can't redefine it.

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 79411e74d8dcd94e18f39504b18ee1dc86e165ce..9ec348047a0e310977276cdc8b8fc5744491e73f 100644 (file)
--- 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 0541943b96ef76828b4dfcf439e76d5d3f5cc9c7..1fb6216509f186044624b007a91ce138387ca5ad 100644 (file)
--- 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,