Merge lp:~mandel/unity/fix-autopilot into lp:unity

Proposed by Manuel de la Peña on 2013-07-12
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2013-07-19
Approved revision: 3419
Merged at revision: 3430
Proposed branch: lp:~mandel/unity/fix-autopilot
Merge into: lp:unity
Diff against target: 87 lines (+19/-1)
6 files modified
dash/previews/ErrorPreview.cpp (+5/-0)
dash/previews/ErrorPreview.h (+2/-0)
dash/previews/MusicPaymentPreview.cpp (+5/-0)
dash/previews/MusicPaymentPreview.h (+1/-0)
dash/previews/PaymentPreview.cpp (+5/-1)
dash/previews/PaymentPreview.h (+1/-0)
To merge this branch: bzr merge lp:~mandel/unity/fix-autopilot
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-07-19
Marco Trevisan (Treviño) 2013-07-12 Approve on 2013-07-12
Leo Arias (community) Approve on 2013-07-12
Review via email: mp+174446@code.launchpad.net

Commit message

Fix the introspection so that QA can work with autopilot.

Description of the change

Fix the introspection so that QA can work with autopilot.

To post a comment you must log in.
Leo Arias (elopio) wrote :

This solves the problem explained in the linked bug.
Thank you Manuel.

Some changes on the autopilot emulators for uniyt will come handy with this. I'll work on that on a following branch.

review: Approve
Marco Trevisan (Treviño) (3v1n0) wrote :

Looks fine!

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dash/previews/ErrorPreview.cpp'
2--- dash/previews/ErrorPreview.cpp 2013-06-05 16:06:33 +0000
3+++ dash/previews/ErrorPreview.cpp 2013-07-12 15:35:37 +0000
4@@ -91,6 +91,11 @@
5 return "ErrorPreview";
6 }
7
8+void ErrorPreview::AddProperties(GVariantBuilder* builder)
9+{
10+ PaymentPreview::AddProperties(builder);
11+}
12+
13 void ErrorPreview::OnActionActivated(ActionButton* button, std::string const& id)
14 {
15 Preview::OnActionActivated(button, id);
16
17=== modified file 'dash/previews/ErrorPreview.h'
18--- dash/previews/ErrorPreview.h 2013-05-10 09:44:12 +0000
19+++ dash/previews/ErrorPreview.h 2013-07-12 15:35:37 +0000
20@@ -72,6 +72,8 @@
21 unsigned long special_keys_state);
22 // From debug::Introspectable
23 std::string GetName() const;
24+ void AddProperties(GVariantBuilder* builder);
25+
26 nux::Layout* GetTitle();
27 nux::Layout* GetPrice();
28 nux::Layout* GetBody();
29
30=== modified file 'dash/previews/MusicPaymentPreview.cpp'
31--- dash/previews/MusicPaymentPreview.cpp 2013-06-04 15:30:22 +0000
32+++ dash/previews/MusicPaymentPreview.cpp 2013-07-12 15:35:37 +0000
33@@ -84,6 +84,11 @@
34 return "MusicPaymentPreview";
35 }
36
37+void MusicPaymentPreview::AddProperties(GVariantBuilder* builder)
38+{
39+ PaymentPreview::AddProperties(builder);
40+}
41+
42 void MusicPaymentPreview::OnActionActivated(ActionButton* button, std::string const& id)
43 {
44 // Check the action id and send the password only when we
45
46=== modified file 'dash/previews/MusicPaymentPreview.h'
47--- dash/previews/MusicPaymentPreview.h 2013-04-25 19:29:13 +0000
48+++ dash/previews/MusicPaymentPreview.h 2013-07-12 15:35:37 +0000
49@@ -74,6 +74,7 @@
50
51 // From debug::Introspectable
52 std::string GetName() const;
53+ void AddProperties(GVariantBuilder* builder);
54
55 nux::Layout* GetTitle();
56 nux::Layout* GetPrice();
57
58=== modified file 'dash/previews/PaymentPreview.cpp'
59--- dash/previews/PaymentPreview.cpp 2013-05-06 11:57:14 +0000
60+++ dash/previews/PaymentPreview.cpp 2013-07-12 15:35:37 +0000
61@@ -194,9 +194,13 @@
62
63 std::string PaymentPreview::GetName() const
64 {
65- return "";
66+ return "PaymentPreview";
67 }
68
69+void PaymentPreview::AddProperties(GVariantBuilder* builder)
70+{
71+ Preview::AddProperties(builder);
72+}
73
74 nux::Layout* PaymentPreview::GetHeader()
75 {
76
77=== modified file 'dash/previews/PaymentPreview.h'
78--- dash/previews/PaymentPreview.h 2013-04-25 19:29:13 +0000
79+++ dash/previews/PaymentPreview.h 2013-07-12 15:35:37 +0000
80@@ -60,6 +60,7 @@
81
82 // From debug::Introspectable
83 std::string GetName() const;
84+ void AddProperties(GVariantBuilder* builder);
85
86 // Create and connect an action link to OnActionLinkActivated
87 nux::ObjectPtr<ActionLink> CreateLink(dash::Preview::ActionPtr action);