address-book-service

Merge lp:~mterry/address-book-service/snap-root into lp:address-book-service

  1. snap-root
  2. Merge into trunk
Proposed by Michael Terry on 2016-11-10
Status: Merged
Approved by: Renato Araujo Oliveira Filho on 2016-11-23
Approved revision: 227
Merged at revision: 226
Proposed branch: lp:~mterry/address-book-service/snap-root
Merge into: lp:address-book-service
Diff against target: 49 lines (+6/-6)
4 files modified
updater/ab-update-buteo-import.cpp (+1/-1)
updater/ab-update.cpp (+3/-3)
upstart/address-book-service.conf.in (+1/-1)
upstart/address-book-updater.conf.in (+1/-1)
To merge this branch: bzr merge lp:~mterry/address-book-service/snap-root
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) 2016-11-10 Approve on 2016-11-17
Review via email: mp+310599@code.launchpad.net

Commit Message

Handle running inside of a snap by respecting the $SNAP variable and not using hard coded paths.

Description of the Change

Handle running inside of a snap.

To post a comment you must log in.
lp:~mterry/address-book-service/snap-root updated on 2016-11-11
227. By Michael Terry on 2016-11-11

Fix whitespace typo

Renato Araujo Oliveira Filho (renatofilho) wrote :

looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'updater/ab-update-buteo-import.cpp'
2--- updater/ab-update-buteo-import.cpp 2015-10-20 23:22:29 +0000
3+++ updater/ab-update-buteo-import.cpp 2016-11-11 00:22:48 +0000
4@@ -59,7 +59,7 @@
5 #define SYNCMONITOR_DBUS_OBJECT_PATH "/com/canonical/SyncMonitor"
6 #define SYNCMONITOR_DBUS_INTERFACE "com.canonical.SyncMonitor"
7
8-#define TRANSFER_ICON "/usr/share/icons/suru/status/scalable/transfer-progress.svg"
9+#define TRANSFER_ICON "transfer-progress"
10
11 using namespace QtContacts;
12
13
14=== modified file 'updater/ab-update.cpp'
15--- updater/ab-update.cpp 2015-10-20 20:38:19 +0000
16+++ updater/ab-update.cpp 2016-11-11 00:22:48 +0000
17@@ -28,9 +28,9 @@
18 #include <QtCore/QDir>
19 #include <QtNetwork/QNetworkConfiguration>
20
21-#define TRANSFER_ICON "/usr/share/icons/suru/status/scalable/transfer-progress.svg"
22-#define TRANSFER_ICON_PAUSED "/usr/share/icons/suru/status/scalable/transfer-paused.svg"
23-#define TRANSFER_ICON_ERROR "/usr/share/icons/suru/status/scalable/transfer-error.svg"
24+#define TRANSFER_ICON "transfer-progress"
25+#define TRANSFER_ICON_PAUSED "transfer-paused"
26+#define TRANSFER_ICON_ERROR "transfer-error"
27
28
29 ABUpdate::ABUpdate(QObject *parent)
30
31=== modified file 'upstart/address-book-service.conf.in'
32--- upstart/address-book-service.conf.in 2015-09-09 19:07:42 +0000
33+++ upstart/address-book-service.conf.in 2016-11-11 00:22:48 +0000
34@@ -14,4 +14,4 @@
35 echo "STOP `date`"
36 end script
37
38-exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-service
39+exec $SNAP@CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-service
40
41=== modified file 'upstart/address-book-updater.conf.in'
42--- upstart/address-book-updater.conf.in 2015-10-09 13:57:11 +0000
43+++ upstart/address-book-updater.conf.in 2016-11-11 00:22:48 +0000
44@@ -4,4 +4,4 @@
45 start on started address-book-service and started msyncd and started sync-monitor
46 stop on runlevel [06]
47
48-exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-updater --sync
49+exec $SNAP@CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-updater --sync

Subscribers

People subscribed via source and target branches