autopilot-gtk

Merge lp:~thomir-deactivatedaccount/autopilot-gtk/trunk-add-version-print into lp:autopilot-gtk

  1. trunk-add-version-print
  2. Merge into trunk
Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 57
Merged at revision: 57
Proposed branch: lp:~thomir-deactivatedaccount/autopilot-gtk/trunk-add-version-print
Merge into: lp:autopilot-gtk
Diff against target: 37 lines (+4/-2)
3 files modified
lib/Introspection.cpp (+1/-1)
lib/Introspection.h (+2/-0)
lib/main.cpp (+1/-1)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/autopilot-gtk/trunk-add-version-print
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Christopher Lee (community) Approve
Review via email: mp+194006@code.launchpad.net

Commit message

Make autopilot-gtk print the wire protocol version when it start up.

Description of the change

Make autopilot-gtk print the wire protocol version when it start up.

To post a comment you must log in.
Revision history for this message
Christopher Lee (veebers) wrote :

Looks good to me.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/autopilot-gtk-autolanding/24/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-amd64-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-armhf-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-i386-autolanding/2/console
    FAILURE: http://10.97.0.26:8080/job/generic-cleanup-mbs/3107/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

Issues in autolanding were CI-related. SHould be fixed now, retrying.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/autopilot-gtk-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-i386-ci/2

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/autopilot-gtk-ci/67/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/Introspection.cpp'
2--- lib/Introspection.cpp 2013-09-04 05:21:51 +0000
3+++ lib/Introspection.cpp 2013-11-05 20:40:34 +0000
4@@ -82,7 +82,7 @@
5 {
6 autopilot_introspection_complete_get_version(introspection_service,
7 invocation,
8- "1.4");
9+ WIRE_PROTO_VERSION.c_str());
10 return TRUE;
11 }
12
13
14=== modified file 'lib/Introspection.h'
15--- lib/Introspection.h 2013-05-08 02:52:12 +0000
16+++ lib/Introspection.h 2013-11-05 20:40:34 +0000
17@@ -27,6 +27,8 @@
18
19 extern AutopilotIntrospection* autopilot_introspection;
20
21+static std::string WIRE_PROTO_VERSION("1.4");
22+
23 void bus_acquired (GObject *object,
24 GAsyncResult * res,
25 gpointer user_data);
26
27=== modified file 'lib/main.cpp'
28--- lib/main.cpp 2013-02-21 00:28:38 +0000
29+++ lib/main.cpp 2013-11-05 20:40:34 +0000
30@@ -112,7 +112,7 @@
31 autopilot_introspection = autopilot_introspection_skeleton_new ();
32 g_bus_get (G_BUS_TYPE_SESSION, NULL, bus_acquired, NULL);
33 // always log this:
34- std::cout << "Autopilot GTK interface loaded." << std::endl;
35+ std::cout << "Autopilot GTK interface loaded. Wire protocol version is " << WIRE_PROTO_VERSION << "." << std::endl;
36 return 0;
37 }
38

Subscribers

People subscribed via source and target branches

to all changes: