From: Guillaume Desmottes Date: Fri, 12 Nov 2010 14:18:06 +0000 (+0100) Subject: tp-chat: rename chat-state-changed to chat-state-changed-empathy X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=935c16f4738604f3738d02b9be7a25cd2b49988a 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 79411e74..9ec34804 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 0541943b..1fb62165 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,