aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-04-28 20:15:23 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-05-25 15:22:41 +0800
commit21bde4f1a8c82330ccb49eb6bdc00a14de7595aa (patch)
tree4f18d35e5532555c2e1f66d502cbb05d95773c4e
parent935c16f4738604f3738d02b9be7a25cd2b49988a (diff)
downloadgsoc2013-empathy-21bde4f1a8c82330ccb49eb6bdc00a14de7595aa.tar
gsoc2013-empathy-21bde4f1a8c82330ccb49eb6bdc00a14de7595aa.tar.gz
gsoc2013-empathy-21bde4f1a8c82330ccb49eb6bdc00a14de7595aa.tar.bz2
gsoc2013-empathy-21bde4f1a8c82330ccb49eb6bdc00a14de7595aa.tar.lz
gsoc2013-empathy-21bde4f1a8c82330ccb49eb6bdc00a14de7595aa.tar.xz
gsoc2013-empathy-21bde4f1a8c82330ccb49eb6bdc00a14de7595aa.tar.zst
gsoc2013-empathy-21bde4f1a8c82330ccb49eb6bdc00a14de7595aa.zip
rename message-received signal to message-received-empathy
-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)