Unity

Merge lp:~seb128/unity/nautilus-desktop-rename into lp:unity

  1. nautilus-desktop-rename
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3944
Proposed branch: lp:~seb128/unity/nautilus-desktop-rename
Merge into: lp:unity
Diff against target: 76 lines (+6/-6)
6 files modified
com.canonical.Unity.gschema.xml (+1/-1)
launcher/ApplicationLauncherIcon.cpp (+1/-1)
tests/autopilot/unity/tests/__init__.py (+1/-1)
tests/autopilot/unity/tests/launcher/test_icon_behavior.py (+1/-1)
tests/autopilot/unity/tests/test_quicklist.py (+1/-1)
tests/test_application_launcher_icon.cpp (+1/-1)
To merge this branch: bzr merge lp:~seb128/unity/nautilus-desktop-rename
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+254103@code.launchpad.net

Commit message

use the new nautilus .desktop name

Description of the change

use the new nautilus .desktop name

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3930
http://jenkins.qa.ubuntu.com/job/unity-ci/1173/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/60
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/60/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1173/rebuild

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

PASSED: Continuous integration, rev:3930
http://jenkins.qa.ubuntu.com/job/unity-ci/1176/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/63

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1176/rebuild

review: Approve (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) :
review: Approve

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 2015-02-03 12:31:32 +0000
+++ com.canonical.Unity.gschema.xml 2015-03-25 15:01:05 +0000
@@ -96,7 +96,7 @@
96 <key type="as" name="favorites">96 <key type="as" name="favorites">
97 <default>[97 <default>[
98 'application://ubiquity.desktop',98 'application://ubiquity.desktop',
99 'application://nautilus.desktop',99 'application://org.gnome.Nautilus.desktop',
100 'application://firefox.desktop',100 'application://firefox.desktop',
101 'application://libreoffice-writer.desktop',101 'application://libreoffice-writer.desktop',
102 'application://libreoffice-calc.desktop',102 'application://libreoffice-calc.desktop',
103103
=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp 2014-07-30 13:05:51 +0000
+++ launcher/ApplicationLauncherIcon.cpp 2015-03-25 15:01:05 +0000
@@ -1188,7 +1188,7 @@
1188{1188{
1189 auto const& desktop_file = DesktopFile();1189 auto const& desktop_file = DesktopFile();
11901190
1191 return boost::algorithm::ends_with(desktop_file, "nautilus.desktop") ||1191 return boost::algorithm::ends_with(desktop_file, "org.gnome.Nautilus.desktop") ||
1192 boost::algorithm::ends_with(desktop_file, "nautilus-folder-handler.desktop") ||1192 boost::algorithm::ends_with(desktop_file, "nautilus-folder-handler.desktop") ||
1193 boost::algorithm::ends_with(desktop_file, "nautilus-home.desktop");1193 boost::algorithm::ends_with(desktop_file, "nautilus-home.desktop");
1194}1194}
11951195
=== modified file 'tests/autopilot/unity/tests/__init__.py'
--- tests/autopilot/unity/tests/__init__.py 2015-02-18 14:14:48 +0000
+++ tests/autopilot/unity/tests/__init__.py 2015-03-25 15:01:05 +0000
@@ -249,7 +249,7 @@
249249
250 def register_nautilus(self):250 def register_nautilus(self):
251 self.addCleanup(self.process_manager.unregister_known_application, "Nautilus")251 self.addCleanup(self.process_manager.unregister_known_application, "Nautilus")
252 self.process_manager.register_known_application("Nautilus", "nautilus.desktop", "nautilus")252 self.process_manager.register_known_application("Nautilus", "org.gnome.Nautilus.desktop", "nautilus")
253253
254 def get_startup_notification_timestamp(self, bamf_window):254 def get_startup_notification_timestamp(self, bamf_window):
255 atom = display.Display().intern_atom('_NET_WM_USER_TIME')255 atom = display.Display().intern_atom('_NET_WM_USER_TIME')
256256
=== modified file 'tests/autopilot/unity/tests/launcher/test_icon_behavior.py'
--- tests/autopilot/unity/tests/launcher/test_icon_behavior.py 2014-03-12 23:44:30 +0000
+++ tests/autopilot/unity/tests/launcher/test_icon_behavior.py 2015-03-25 15:01:05 +0000
@@ -175,7 +175,7 @@
175 self.assertThat(lambda: len(self.process_manager.get_open_windows_by_application("Nautilus")), Eventually(Equals(1)))175 self.assertThat(lambda: len(self.process_manager.get_open_windows_by_application("Nautilus")), Eventually(Equals(1)))
176176
177 nautilus_app = self.process_manager.get_app_instances("Nautilus")177 nautilus_app = self.process_manager.get_app_instances("Nautilus")
178 nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="nautilus.desktop")178 nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="org.gnome.Nautilus.desktop")
179 self.launcher_instance.click_launcher_icon(nautilus_icon)179 self.launcher_instance.click_launcher_icon(nautilus_icon)
180 self.assertThat(lambda: len(self.process_manager.get_open_windows_by_application("Nautilus")), Eventually(Equals(2)))180 self.assertThat(lambda: len(self.process_manager.get_open_windows_by_application("Nautilus")), Eventually(Equals(2)))
181181
182182
=== modified file 'tests/autopilot/unity/tests/test_quicklist.py'
--- tests/autopilot/unity/tests/test_quicklist.py 2014-03-04 22:50:22 +0000
+++ tests/autopilot/unity/tests/test_quicklist.py 2015-03-25 15:01:05 +0000
@@ -75,7 +75,7 @@
75 self.process_manager.start_app_window("Calculator")75 self.process_manager.start_app_window("Calculator")
76 self.process_manager.start_app(self.app_name)76 self.process_manager.start_app(self.app_name)
7777
78 nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="nautilus.desktop")78 nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="org.gnome.Nautilus.desktop")
79 ql = self.open_quicklist_for_icon(nautilus_icon)79 ql = self.open_quicklist_for_icon(nautilus_icon)
80 de = self.get_desktop_entry("Nautilus")80 de = self.get_desktop_entry("Nautilus")
8181
8282
=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp 2014-03-12 23:44:57 +0000
+++ tests/test_application_launcher_icon.cpp 2015-03-25 15:01:05 +0000
@@ -1101,7 +1101,7 @@
1101 EXPECT_FALSE(empty_icon->IsFileManager());1101 EXPECT_FALSE(empty_icon->IsFileManager());
1102 EXPECT_FALSE(mock_icon->IsFileManager());1102 EXPECT_FALSE(mock_icon->IsFileManager());
11031103
1104 auto app = std::make_shared<MockApplication::Nice>("/any/path/nautilus.desktop", "Nautilus");1104 auto app = std::make_shared<MockApplication::Nice>("/any/path/org.gnome.Nautilus.desktop", "Nautilus");
1105 MockApplicationLauncherIcon::Ptr icon(new NiceMock<MockApplicationLauncherIcon>(app));1105 MockApplicationLauncherIcon::Ptr icon(new NiceMock<MockApplicationLauncherIcon>(app));
1106 EXPECT_TRUE(icon->IsFileManager());1106 EXPECT_TRUE(icon->IsFileManager());
11071107