Merge lp:~phablet-team/messaging-framework/create_group_with_title into lp:messaging-framework

[Gustavo Pichorim Boiko]

Make sure we use the initial title if available.

Make sure we use the initial title if available.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:41
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/13/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/890/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/890/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:42
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/14/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/891/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/891/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good. thanks.

review: Approve

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-autoland/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/892/console
    None: https://jenkins.canonical.com/system-apps/job/lp-generic-land-mp/7/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/892/console

review: Needs Fixing (continuous-integration)

=== modified file 'src/messaging/qt/tp/connection.cpp'
--- src/messaging/qt/tp/connection.cpp	2016-07-05 13:47:29 +0000
+++ src/messaging/qt/tp/connection.cpp	2016-07-08 03:32:47 +0000
@@ -559,6 +559,7 @@
             // received the request. We have to switch to Room type and get the provided information
 
             messaging::Members initial_invitees;
+            std::string title;
             if (hints.contains(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeIDs")))
             {
                 QStringList initial_invitees_ids =
@@ -571,6 +572,11 @@
                 }
             }
 
+            if (hints.contains(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG + QLatin1String(".Title")))
+            {
+                title = hints[TP_QT_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG + QLatin1String(".Title")].toString().toStdString();
+            }
+
             // check if the client requested a chat room
             if (hints.contains(TP_QT_IFACE_CHANNEL_INTERFACE_ROOM + QLatin1String(".RoomName")))
             {
@@ -582,7 +588,7 @@
             recipient = std::make_shared<messaging::Group>(
                         std::string{} /* no id exists yet */,
                         initial_invitees,
-                        std::string{} /* group_title */);
+                        title);
 
             std::shared_ptr<GroupStarter> group_starter = connection->group_starter();
             messaging::Group::shared_ptr group = std::dynamic_pointer_cast<messaging::Group>(recipient);