Merge lp:~ken-vandine/friends-app/fix_avatar into lp:friends-app

[Ken VanDine]

No longer attempt to append .100px to the avatar images

No longer attempt to append .100px to the avatar images

[lp:~ken-vandine/friends-app/fix_avatar]

79. By Ken VanDine on 2013-06-19

No longer attempt to append .100px to the avatar images (LP: #1177945)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/friends-app-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-saucy-amd64-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-app-ci/7/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Nice and simple ;-)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-18 14:29:30 +0000
+++ debian/changelog	2013-06-19 04:45:32 +0000
@@ -1,3 +1,16 @@
+friends-app (0.91.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * No longer attempt to append .100px to the avatar images (LP: #1177945)
+
+ -- Ken VanDine <[e-mail]>  Wed, 19 Jun 2013 00:08:47 -0400
+
+friends-app (0.91.0-0ubuntu2) saucy; urgency=low
+
+  * debian/control
+    - depend on qtdeclarative5-hud1.0
+
+ -- Ken VanDine <[e-mail]>  Wed, 19 Jun 2013 00:08:47 -0400
+
 friends-app (0.91.0-0ubuntu1) saucy; urgency=low
 
   [ Stuart Langridge ]

=== modified file 'debian/control'
--- debian/control	2013-04-05 16:39:00 +0000
+++ debian/control	2013-06-19 04:45:32 +0000
@@ -15,9 +15,10 @@
 Architecture: amd64 i386 armhf
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         qtdeclarative5-accounts-plugin,
+         qtdeclarative5-friends-plugin (>= 0.1.0bzr13.04.02),
+         qtdeclarative5-hud1.0,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
-         qtdeclarative5-friends-plugin (>= 0.1.0bzr13.04.02),
-         qtdeclarative5-accounts-plugin,
 Replaces: gwibber-service, gwibber (<< 3.7.0bzr13.04.05-0ubuntu1)
 Conflicts: gwibber-service, gwibber (<< 3.7.0bzr13.04.05-0ubuntu1)
 Provides: gwibber

=== modified file 'qml/StatusUpdateTile.qml'
--- qml/StatusUpdateTile.qml	2013-05-10 15:37:45 +0000
+++ qml/StatusUpdateTile.qml	2013-06-19 04:45:32 +0000
@@ -110,17 +110,11 @@
                 topMargin: units.gu(1)
             }
             image: Image {
-                source: Qt.resolvedUrl(avatar+".100px")
+                source: Qt.resolvedUrl(avatar)
                 asynchronous: true
                 smooth: true
                 fillMode: Image.PreserveAspectCrop
                 sourceSize.width: units.dp(48)
-                onStatusChanged: {
-                    if (status == Image.Error) {
-                        console.log ("onStatusChanged Error: "+source);
-                        source = Qt.resolvedUrl(avatar);
-                    }
-                }
             }
 
             MouseArea {