[empathy] tp-chat: rename chat-state-changed to chat-state-changed-empathy
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] tp-chat: rename chat-state-changed to chat-state-changed-empathy
- Date: Wed, 25 May 2011 08:03:29 +0000 (UTC)
commit 935c16f4738604f3738d02b9be7a25cd2b49988a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Fri Nov 12 15:18:06 2010 +0100
tp-chat: rename chat-state-changed to chat-state-changed-empathy
chat-state-changed already exists in TpChannel and we can't redefine it.
libempathy-gtk/empathy-chat.c | 2 +-
libempathy/empathy-tp-chat.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 79411e7..9ec3480 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 0541943..1fb6216 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]