aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-chat.c2
-rw-r--r--libempathy/empathy-tp-chat.c2
-rw-r--r--src/empathy-event-manager.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 9ec348047..5e1124cdc 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 1fb621650..653457b24 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 00d2c8ab8..f75fbc54b 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)