Merge lp:~mihirsoni/ubuntu-calendar-app/1291906 into lp:ubuntu-calendar-app

Proposed by Mihir Soni
Status: Merged
Approved by: Mihir Soni
Approved revision: 342
Merged at revision: 340
Proposed branch: lp:~mihirsoni/ubuntu-calendar-app/1291906
Merge into: lp:ubuntu-calendar-app
Diff against target: 14 lines (+10/-0)
1 file modified
com.ubuntu.calendar.desktop (+10/-0)
To merge this branch: bzr merge lp:~mihirsoni/ubuntu-calendar-app/1291906
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+225161@code.launchpad.net

Commit message

Resolved bug #1291906

Description of the change

Resolved bug #1291906

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Thanks Mihir for the fix. However, it seems that there are unrelated changes in the fix. Could you update the branch so that it only include the .desktop file fix, as described in the bug?

review: Needs Fixing
Revision history for this message
David Planella (dpm) wrote :

Also, you'll need to expand the @@ variables for the desktop file to work. See the inline comments and the clock app for an example.

review: Needs Fixing
341. By Mihir Soni

removed other code change from the MR

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

See inline comments.

review: Needs Fixing
342. By Mihir Soni

added qmlscene

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Looks good to me now

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'com.ubuntu.calendar.desktop'
2--- com.ubuntu.calendar.desktop 1970-01-01 00:00:00 +0000
3+++ com.ubuntu.calendar.desktop 2014-07-02 06:46:23 +0000
4@@ -0,0 +1,10 @@
5+[Desktop Entry]
6+Version=1.0
7+Type=Application
8+Terminal=false
9+Exec=qmlscene calendar.qml
10+Icon=calendar-app@30.png
11+_Name=Calendar
12+_Comment=A calendar for Ubuntu which syncs with online accounts.
13+_Keywords=calendar;event;day;week;year;appointment;meeting;
14+X-Ubuntu-Touch=true

Subscribers

People subscribed via source and target branches

to status/vote changes: