[Merge] lp:~boiko/messaging-app/background_and_overlay into lp:messaging-app

[Tiago Salem Herrmann]

Review: Needs Fixing



Diff comments:

> 
> === modified file 'src/qml/Messages.qml'
> --- src/qml/Messages.qml	2015-11-30 19:58:56 +0000
> +++ src/qml/Messages.qml	2015-11-30 19:58:56 +0000
> @@ -1023,6 +1024,22 @@
>          }
>      }
>  
> +    Image {
> +        height: units.gu(20)
> +        width: units.gu(20)
> +        anchors.centerIn: messageList
> +        visible: source !== ""
> +        source: {
> +            // FIXME - get the info from the provided accounts
> +            var accountId = "ofono/ofono/account0"
> +            if (presenceRequest.type != PresenceRequest.PresenceTypeUnknown
> +                    && presenceRequest.type != PresenceRequest.PresenceTypeUnset) {
> +                accountId = presenceRequest.accountId
> +            }
> +            return telepathyHelper.accountForId(accountId).protocolInfo.backgroundFile

backgroundFile was renamed to backgroundImage

> +        }
> +    }
> +
>      KeyboardRectangle {
>          id: keyboard
>      }


-- 
https://code.launchpad.net/~boiko/messaging-app/background_and_overlay/+merge/278646
Your team Ubuntu Phablet Team is subscribed to branch lp:messaging-app.