[empathy] rename message-received signal to message-received-empathy
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] rename message-received signal to message-received-empathy
- Date: Wed, 25 May 2011 08:03:34 +0000 (UTC)
commit 21bde4f1a8c82330ccb49eb6bdc00a14de7595aa
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Thu Apr 28 14:15:23 2011 +0200
rename message-received signal to message-received-empathy
libempathy-gtk/empathy-chat.c | 2 +-
libempathy/empathy-tp-chat.c | 2 +-
src/empathy-event-manager.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 9ec3480..5e1124c 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -3660,7 +3660,7 @@ empathy_chat_set_tp_chat (EmpathyChat *chat,
g_signal_connect (tp_chat, "destroy",
G_CALLBACK (chat_destroy_cb),
chat);
- g_signal_connect (tp_chat, "message-received",
+ g_signal_connect (tp_chat, "message-received-empathy",
G_CALLBACK (chat_message_received_cb),
chat);
g_signal_connect (tp_chat, "message_acknowledged",
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 1fb6216..653457b 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1617,7 +1617,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
/* Signals */
signals[MESSAGE_RECEIVED] =
- g_signal_new ("message-received",
+ g_signal_new ("message-received-empathy",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 00d2c8a..f75fbc5 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -966,7 +966,7 @@ approve_channels (TpSimpleApprover *approver,
}
/* 1-1 text channel, wait for the first message */
- approval->handler = g_signal_connect (tp_chat, "message-received",
+ approval->handler = g_signal_connect (tp_chat, "message-received-empathy",
G_CALLBACK (event_manager_chat_message_received_cb), approval);
}
else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]