Unity

Merge lp:~seb128/unity/nautilus-default-launcher-icon into lp:unity

  1. nautilus-default-launcher-icon
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Michael Terry
Approved revision: no longer in the source branch.
Merged at revision: 3210
Proposed branch: lp:~seb128/unity/nautilus-default-launcher-icon
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:~seb128/unity/nautilus-default-launcher-icon
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Terry Approve
Review via email: mp+152382@code.launchpad.net

Commit message

Use nautilus.desktop for the default launcher's entry

Description of the change

Use nautilus.desktop for the default launcher's entry

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Looks fine to me.

review: Approve
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
=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml 2013-02-06 11:07:00 +0000
+++ com.canonical.Unity.gschema.xml 2013-03-08 11:32:22 +0000
@@ -44,7 +44,7 @@
44 </schema>44 </schema>
45 <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">45 <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
46 <key type="as" name="favorites">46 <key type="as" name="favorites">
47 <default>[ 'application://ubiquity-gtkui.desktop', 'application://nautilus-home.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>47 <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>
48 <summary>List of items that should be shown by default in the launcher</summary>48 <summary>List of items that should be shown by default in the launcher</summary>
49 <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>49 <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>
50 </key>50 </key>