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

Proposed by Sebastien Bacher on 2015-03-25
Status: Merged
Approved by: Stephen M. Webb on 2015-03-30
Approved revision: 3930
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) 2015-03-25 Approve on 2015-03-30
PS Jenkins bot (community) continuous-integration Approve on 2015-03-27
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.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Stephen M. Webb (bregma) :
review: Approve

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 2015-02-03 12:31:32 +0000
3+++ com.canonical.Unity.gschema.xml 2015-03-25 15:01:05 +0000
4@@ -96,7 +96,7 @@
5 <key type="as" name="favorites">
6 <default>[
7 'application://ubiquity.desktop',
8- 'application://nautilus.desktop',
9+ 'application://org.gnome.Nautilus.desktop',
10 'application://firefox.desktop',
11 'application://libreoffice-writer.desktop',
12 'application://libreoffice-calc.desktop',
13
14=== modified file 'launcher/ApplicationLauncherIcon.cpp'
15--- launcher/ApplicationLauncherIcon.cpp 2014-07-30 13:05:51 +0000
16+++ launcher/ApplicationLauncherIcon.cpp 2015-03-25 15:01:05 +0000
17@@ -1188,7 +1188,7 @@
18 {
19 auto const& desktop_file = DesktopFile();
20
21- return boost::algorithm::ends_with(desktop_file, "nautilus.desktop") ||
22+ return boost::algorithm::ends_with(desktop_file, "org.gnome.Nautilus.desktop") ||
23 boost::algorithm::ends_with(desktop_file, "nautilus-folder-handler.desktop") ||
24 boost::algorithm::ends_with(desktop_file, "nautilus-home.desktop");
25 }
26
27=== modified file 'tests/autopilot/unity/tests/__init__.py'
28--- tests/autopilot/unity/tests/__init__.py 2015-02-18 14:14:48 +0000
29+++ tests/autopilot/unity/tests/__init__.py 2015-03-25 15:01:05 +0000
30@@ -249,7 +249,7 @@
31
32 def register_nautilus(self):
33 self.addCleanup(self.process_manager.unregister_known_application, "Nautilus")
34- self.process_manager.register_known_application("Nautilus", "nautilus.desktop", "nautilus")
35+ self.process_manager.register_known_application("Nautilus", "org.gnome.Nautilus.desktop", "nautilus")
36
37 def get_startup_notification_timestamp(self, bamf_window):
38 atom = display.Display().intern_atom('_NET_WM_USER_TIME')
39
40=== modified file 'tests/autopilot/unity/tests/launcher/test_icon_behavior.py'
41--- tests/autopilot/unity/tests/launcher/test_icon_behavior.py 2014-03-12 23:44:30 +0000
42+++ tests/autopilot/unity/tests/launcher/test_icon_behavior.py 2015-03-25 15:01:05 +0000
43@@ -175,7 +175,7 @@
44 self.assertThat(lambda: len(self.process_manager.get_open_windows_by_application("Nautilus")), Eventually(Equals(1)))
45
46 nautilus_app = self.process_manager.get_app_instances("Nautilus")
47- nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="nautilus.desktop")
48+ nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="org.gnome.Nautilus.desktop")
49 self.launcher_instance.click_launcher_icon(nautilus_icon)
50 self.assertThat(lambda: len(self.process_manager.get_open_windows_by_application("Nautilus")), Eventually(Equals(2)))
51
52
53=== modified file 'tests/autopilot/unity/tests/test_quicklist.py'
54--- tests/autopilot/unity/tests/test_quicklist.py 2014-03-04 22:50:22 +0000
55+++ tests/autopilot/unity/tests/test_quicklist.py 2015-03-25 15:01:05 +0000
56@@ -75,7 +75,7 @@
57 self.process_manager.start_app_window("Calculator")
58 self.process_manager.start_app(self.app_name)
59
60- nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="nautilus.desktop")
61+ nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="org.gnome.Nautilus.desktop")
62 ql = self.open_quicklist_for_icon(nautilus_icon)
63 de = self.get_desktop_entry("Nautilus")
64
65
66=== modified file 'tests/test_application_launcher_icon.cpp'
67--- tests/test_application_launcher_icon.cpp 2014-03-12 23:44:57 +0000
68+++ tests/test_application_launcher_icon.cpp 2015-03-25 15:01:05 +0000
69@@ -1101,7 +1101,7 @@
70 EXPECT_FALSE(empty_icon->IsFileManager());
71 EXPECT_FALSE(mock_icon->IsFileManager());
72
73- auto app = std::make_shared<MockApplication::Nice>("/any/path/nautilus.desktop", "Nautilus");
74+ auto app = std::make_shared<MockApplication::Nice>("/any/path/org.gnome.Nautilus.desktop", "Nautilus");
75 MockApplicationLauncherIcon::Ptr icon(new NiceMock<MockApplicationLauncherIcon>(app));
76 EXPECT_TRUE(icon->IsFileManager());
77