Unity

Merge lp:~jbicha/unity/adjust-to-ubiquity-desktop-rename into lp:unity

  1. adjust-to-ubiquity-desktop-rename
  2. Merge into trunk
Proposed by Jeremy Bícha
Status: Merged
Approved by: Sebastien Bacher
Approved revision: no longer in the source branch.
Merged at revision: 3453
Proposed branch: lp:~jbicha/unity/adjust-to-ubiquity-desktop-rename
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
com.canonical.Unity.gschema.xml (+1/-1)
To merge this branch: bzr merge lp:~jbicha/unity/adjust-to-ubiquity-desktop-rename
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Christopher Townsend Approve
Dimitri John Ledkov Approve
Review via email: mp+178152@code.launchpad.net

Commit message

Adjust to rename of ubiquity-gtkui.desktop to ubiquity.desktop

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

The equivalent merge has been done in ubiquity and casper already.
Please merge this, to bring back the installer icon.

review: Approve
Revision history for this message
Christopher Townsend (townsend) wrote :

Definitely needed and looks reasonable.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/199/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/1237/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/155
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/155/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/155

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/200/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/156
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/156/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/156

review: Needs Fixing (continuous-integration)
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

The armhf failure is unrelated to this change. Can this be force merged please?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/201/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/157
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/157/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/157

review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

changing to approve again, the libhybris problem on armhf should be fixed with today updates

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'com.canonical.Unity.gschema.xml'
2--- com.canonical.Unity.gschema.xml 2013-05-03 18:59:08 +0000
3+++ com.canonical.Unity.gschema.xml 2013-08-01 19:18:26 +0000
4@@ -49,7 +49,7 @@
5 </schema>
6 <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
7 <key type="as" name="favorites">
8- <default>[ 'application://ubiquity-gtkui.desktop', 'application://nautilus.desktop', 'application://firefox.desktop', 'application://libreoffice-writer.desktop', 'application://libreoffice-calc.desktop', 'application://libreoffice-impress.desktop', 'application://ubuntu-software-center.desktop', 'application://ubuntuone-installer.desktop', 'application://ubuntu-amazon-default.desktop', 'application://UbuntuOneMusiconeubuntucom.desktop', 'application://gnome-control-center.desktop', 'unity://running-apps', 'unity://expo-icon', 'unity://devices' ]</default>
9+ <default>[ 'application://ubiquity.desktop', 'application://nautilus.desktop', 'application://firefox.desktop', 'application://libreoffice-writer.desktop', 'application://libreoffice-calc.desktop', 'application://libreoffice-impress.desktop', 'application://ubuntu-software-center.desktop', 'application://ubuntuone-installer.desktop', 'application://ubuntu-amazon-default.desktop', 'application://UbuntuOneMusiconeubuntucom.desktop', 'application://gnome-control-center.desktop', 'unity://running-apps', 'unity://expo-icon', 'unity://devices' ]</default>
10 <summary>List of items that should be shown by default in the launcher</summary>
11 <description>These items can be: application://desktop-id.desktop, device://uiid and unity://special-id (including: unity://running-apps (icons of running applications) unity://devices (icons of attached devices), unity://expo-icon (icon of the workspace switcher) and unity://desktop-icon (the show-desktop icon)); the order of this list determines the launcher item's position.</description>
12 </key>