rename message-received signal to message-received-empathy

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 9ec348047a0e310977276cdc8b8fc5744491e73f..5e1124cdc32ec7c641b1cf8f6560e1880d0f4a49 100644 (file)
--- 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 1fb6216509f186044624b007a91ce138387ca5ad..653457b24f02bdd22d75e03d5a85600090e1a61f 100644 (file)
--- 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 00d2c8ab818dc59dba75c9bead9d06ec0372ae12..f75fbc54ba77a5e34afdc6b5e3bbf90272c73579 100644 (file)
--- 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)