Unity

Merge lp:~cyphermox/unity/revert-gcalctool into lp:unity

  1. revert-gcalctool
  2. Merge into trunk
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Francis Ginther
Approved revision: no longer in the source branch.
Merged at revision: 3226
Proposed branch: lp:~cyphermox/unity/revert-gcalctool
Merge into: lp:unity
Diff against target: 25 lines (+2/-2)
2 files modified
tests/autopilot/unity/emulators/launcher.py (+1/-1)
tests/autopilot/unity/tests/launcher/test_icon_behavior.py (+1/-1)
To merge this branch: bzr merge lp:~cyphermox/unity/revert-gcalctool
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Terry Approve
Review via email: mp+153923@code.launchpad.net

Commit message

Renamed gcalctool desktop file

Description of the change

Renamed gcalctool desktop file

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

Looks right.

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Looks like this wasn't top-approved despite the review. Doing so now.

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 'tests/autopilot/unity/emulators/launcher.py'
--- tests/autopilot/unity/emulators/launcher.py 2013-03-06 15:44:44 +0000
+++ tests/autopilot/unity/emulators/launcher.py 2013-03-18 20:03:22 +0000
@@ -494,7 +494,7 @@
494 looking for an icon. For example, to find an icon with a particular494 looking for an icon. For example, to find an icon with a particular
495 desktop_id, one might do this from within a test:495 desktop_id, one might do this from within a test:
496496
497 >>> self.launcher.model.get_icon(desktop_id="gnome-calculator.desktop")497 >>> self.launcher.model.get_icon(desktop_id="gcalctool.desktop")
498498
499 This method returns only one icon. It is the callers responsibility to499 This method returns only one icon. It is the callers responsibility to
500 ensure that the filter matches only one icon.500 ensure that the filter matches only one icon.
501501
=== modified file 'tests/autopilot/unity/tests/launcher/test_icon_behavior.py'
--- tests/autopilot/unity/tests/launcher/test_icon_behavior.py 2013-02-28 17:38:29 +0000
+++ tests/autopilot/unity/tests/launcher/test_icon_behavior.py 2013-03-18 20:03:22 +0000
@@ -315,7 +315,7 @@
315 # not exist, and we don't want to wait for 10 seconds, so we do this315 # not exist, and we don't want to wait for 10 seconds, so we do this
316 # the old fashioned way.316 # the old fashioned way.
317 get_icon_fn = lambda: self.unity.launcher.model.get_children_by_type(317 get_icon_fn = lambda: self.unity.launcher.model.get_children_by_type(
318 ApplicationLauncherIcon, desktop_id="gnome-calculator.desktop")318 ApplicationLauncherIcon, desktop_id="gcalctool.desktop")
319 calc_icon = get_icon_fn()319 calc_icon = get_icon_fn()
320 if calc_icon:320 if calc_icon:
321 self.launcher_instance.unlock_from_launcher(calc_icon[0])321 self.launcher_instance.unlock_from_launcher(calc_icon[0])