Online Accounts: Sign-on UI

Merge lp:~mardy/signon-ui/no-hardcoded-prefix into lp:signon-ui

  1. no-hardcoded-prefix
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 103
Merged at revision: 103
Proposed branch: lp:~mardy/signon-ui/no-hardcoded-prefix
Merge into: lp:signon-ui
Diff against target: 45 lines (+8/-2)
4 files modified
.bzrignore (+2/-0)
src/com.canonical.indicators.webcredentials.service.in (+1/-1)
src/com.nokia.singlesignonui.service.in (+1/-1)
src/signon-ui.pro (+4/-0)
To merge this branch: bzr merge lp:~mardy/signon-ui/no-hardcoded-prefix
Reviewer Review Type Date Requested Status
Alex Fiestas (community) Approve
Ken VanDine Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+168410@code.launchpad.net

Commit message

Do not hardcode the prefix in D-Bus service files

Description of the change

Do not hardcode the prefix in D-Bus service files

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

PASSED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-saucy-amd64-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-ui-ci/23/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve
Revision history for this message
Alex Fiestas (afiestas) wrote :

tested, it compiles and it works.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2013-04-19 11:13:03 +0000
3+++ .bzrignore 2013-06-10 11:16:37 +0000
4@@ -19,6 +19,8 @@
5 signon-ui-test
6 src/browser-process/browser-process
7 src/browser-process/signon-ui-browser-process.desktop
8+src/com.canonical.indicators.webcredentials.service
9+src/com.nokia.singlesignonui.service
10 src/signon-ui
11 src/signon_ui_adaptor.*
12 src/webcredentials_adaptor.*
13
14=== renamed file 'src/com.canonical.indicators.webcredentials.service' => 'src/com.canonical.indicators.webcredentials.service.in'
15--- src/com.canonical.indicators.webcredentials.service 2012-03-06 12:41:37 +0000
16+++ src/com.canonical.indicators.webcredentials.service.in 2013-06-10 11:16:37 +0000
17@@ -1,3 +1,3 @@
18 [D-BUS Service]
19 Name=com.canonical.indicators.webcredentials
20-Exec=/usr/bin/signon-ui
21+Exec=$${INSTALL_PREFIX}/bin/signon-ui
22
23=== renamed file 'src/com.nokia.singlesignonui.service' => 'src/com.nokia.singlesignonui.service.in'
24--- src/com.nokia.singlesignonui.service 2011-12-02 09:19:15 +0000
25+++ src/com.nokia.singlesignonui.service.in 2013-06-10 11:16:37 +0000
26@@ -1,3 +1,3 @@
27 [D-BUS Service]
28 Name=com.nokia.singlesignonui
29-Exec=/usr/bin/signon-ui
30+Exec=$${INSTALL_PREFIX}/bin/signon-ui
31
32=== modified file 'src/signon-ui.pro'
33--- src/signon-ui.pro 2013-05-02 19:17:06 +0000
34+++ src/signon-ui.pro 2013-06-10 11:16:37 +0000
35@@ -110,6 +110,10 @@
36 QMAKE_EXTRA_TARGETS += \
37 po
38
39+QMAKE_SUBSTITUTES += \
40+ com.canonical.indicators.webcredentials.service.in \
41+ com.nokia.singlesignonui.service.in
42+
43 service.path = $${INSTALL_PREFIX}/share/dbus-1/services
44 service.files = \
45 com.canonical.indicators.webcredentials.service \

Subscribers

People subscribed via source and target branches

to all changes: