Merge lp://staging/~phablet-team/history-service/group-chat into lp://staging/history-service

add FieldParticipantIds

use participantIds instead of participants

do not group multimedia group chats

Expose the chat type to QML.

do not update room info if no accountId or threadId is provided

remove chat_room_info when thread is removed

do not allow inserting into chat_room_info if threadId or accountId are empty

update thread participants

Remove messages that were superseded.

Make sure we don't return chat rooms in threadForParticipants()

Fix selecting participants

Make sure we don't group threads of chat rooms with one member

Use another condition to determine when to group multimedia threads.

set chatType to 1 (Contact) for existing ofono 1-1 chats. Leave mms group chats as 0 (None).

Fix the condition for grouping multimedia accounts.

Update copyright header

When checking which threads to group, discard the ones we know should not be grouped.

Fix build.

Force chatType for legacy method calls

fix member change signaling

Get the interfaces' properties using the class methods instead of calling dbus directly.

Update copyright headers

Make sure related queries are run in a transaction.

Add one missing rollback.

Add missing specs.

Handle waiting of asyncronous interface properties correctly to avoid crashes.

Fix tests.

merge trunk

add support for local and remote pending member lists

Rename types

use macros and fill pending participants list correctly

Fix returning threads with no participants.

Do not wait for the DBus async calls to finish (doing processEvents() in between).
It causes inconsistencies and crashes in history-daemon. Use QDBusAbstractInterface::call
instead.

As a temporary fix, insert an event telling the user he joined a group.

Update the room properties when we get the channel for it.

Avoid reverting status of messages

Make sure we only insert the information event once in the thread when joining
a group chat.

Make sure new threads get a good timestamp.

Make sure empty threads have a reasonable timestamp and show in the right
position on the list.

Remove unwanted debug

Merge trunk

compile agains new qt

set Requested = true so other clients know if the channel is new and requested or not

set ChatRoomInfo to new threads

avoid adding invalid values into the map

add state to participants

add support for contact roles

Export Roles to qml

set state as well

remove pending members from participants

skip update if no properties are found

merge parent branch

Add comments on things that need fixing

we have to also group broadcast messages