Merge lp:~bzoltan/ubuntu-calendar-app/namig-fix into lp:ubuntu-calendar-app

[Zoltan Balogh]

The desktop file name is fixed and the MainView has now application name prooperty

The desktop file name is fixed and the MainView has now application name prooperty

[Frank Mertens (frankencode)]

Looks good.

review: Approve (checked the diff)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~bzoltan/ubuntu-calendar-app/namig-fix/+merge/153766/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== renamed file 'Calendar.desktop' => 'calendar.desktop'
=== modified file 'calendar.qml'
--- calendar.qml	2013-03-10 21:45:05 +0000
+++ calendar.qml	2013-03-18 11:42:26 +0000
@@ -3,6 +3,10 @@
 
 MainView {
     id: mainView
+
+    objectName: "calendar"
+    applicationName: "calendar"
+
     width: units.gu(45)
     height: units.gu(80)
         // FIXME: 80/45 = aspect ration of Galaxy Nexus