commit 7b60b59afa921e30a10ff915b12f436b69456fc9
author Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Tue Jun 16 12:29:07 2015 -0400
committer Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Tue Jun 16 12:29:13 2015 -0400
tree b5ba10db0447a342eb8f5d6499c1a272041be23e
parent 7d75eab66f8952df61f8b67bd58039a8f08d3874

gnome: open chat view on incoming message

Open the chat text view if it is closed when
receiving a new message.

Refs #75364

Change-Id: I53ee22d079cdb710fbb26eca5edd8b9b5bbd160f

src/currentcallview.cpp

diff --git a/src/currentcallview.cpp b/src/currentcallview.cpp
index ffe6d40..c10935e 100644
--- a/src/currentcallview.cpp
+++ b/src/currentcallview.cpp
@@ -81,6 +81,7 @@
     QMetaObject::Connection remote_renderer_connection;
     QMetaObject::Connection media_added_connection;
     QMetaObject::Connection new_message_connection;
+    QMetaObject::Connection incoming_msg_connection;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE(CurrentCallView, current_call_view, GTK_TYPE_BOX);
@@ -102,6 +103,7 @@
     QObject::disconnect(priv->remote_renderer_connection);
     QObject::disconnect(priv->media_added_connection);
     QObject::disconnect(priv->new_message_connection);
+    QObject::disconnect(priv->incoming_msg_connection);
 
     if (priv->fullscreen_window) {
         gtk_widget_destroy(priv->fullscreen_window);
@@ -314,6 +316,23 @@
 }
 
 void
+monitor_incoming_message(CurrentCallView *self, Media::Text *media)
+{
+    g_return_if_fail(IS_CURRENT_CALL_VIEW(self));
+    CurrentCallViewPrivate *priv = CURRENT_CALL_VIEW_GET_PRIVATE(self);
+
+    /* connect to incoming chat messages to open the chat view */
+    QObject::disconnect(priv->incoming_msg_connection);
+    priv->incoming_msg_connection = QObject::connect(
+        media,
+        &Media::Text::messageReceived,
+        [priv] (G_GNUC_UNUSED const QString& message) {
+            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->togglebutton_chat), TRUE);
+        }
+    );
+}
+
+void
 current_call_view_set_call_info(CurrentCallView *view, const QModelIndex& idx) {
     CurrentCallViewPrivate *priv = CURRENT_CALL_VIEW_GET_PRIVATE(view);
 
@@ -392,9 +411,11 @@
     if (priv->call->hasMedia(Media::Media::Type::TEXT, Media::Media::Direction::IN)) {
         Media::Text *text = priv->call->firstMedia<Media::Text>(Media::Media::Direction::IN);
         parse_chat_model(text->recording()->instantMessagingModel(), view);
+        monitor_incoming_message(view, text);
     } else if (priv->call->hasMedia(Media::Media::Type::TEXT, Media::Media::Direction::OUT)) {
         Media::Text *text = priv->call->firstMedia<Media::Text>(Media::Media::Direction::OUT);
         parse_chat_model(text->recording()->instantMessagingModel(), view);
+        monitor_incoming_message(view, text);
     } else {
         /* monitor media for messaging text messaging */
         priv->media_added_connection = QObject::connect(
@@ -403,6 +424,7 @@
             [view, priv] (Media::Media* media) {
                 if (media->type() == Media::Media::Type::TEXT) {
                     parse_chat_model(((Media::Text*)media)->recording()->instantMessagingModel(), view);
+                    monitor_incoming_message(view, (Media::Text*)media);
                     QObject::disconnect(priv->media_added_connection);
                 }
             }