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

[Michael Terry]

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

Handle running inside of a snap.

[lp:~mterry/address-book-service/snap-root]

227. By Michael Terry on 2016-11-11

Fix whitespace typo

[Renato Araujo Oliveira Filho (renatofilho)]

looks good to me.

review: Approve

=== modified file 'updater/ab-update-buteo-import.cpp'
--- updater/ab-update-buteo-import.cpp	2015-10-20 23:22:29 +0000
+++ updater/ab-update-buteo-import.cpp	2016-11-11 00:22:48 +0000
@@ -59,7 +59,7 @@
 #define SYNCMONITOR_DBUS_OBJECT_PATH     "/com/canonical/SyncMonitor"
 #define SYNCMONITOR_DBUS_INTERFACE       "com.canonical.SyncMonitor"
 
-#define TRANSFER_ICON           "/usr/share/icons/suru/status/scalable/transfer-progress.svg"
+#define TRANSFER_ICON           "transfer-progress"
 
 using namespace QtContacts;
 
 
=== modified file 'updater/ab-update.cpp'
--- updater/ab-update.cpp	2015-10-20 20:38:19 +0000
+++ updater/ab-update.cpp	2016-11-11 00:22:48 +0000
@@ -28,9 +28,9 @@
 #include <QtCore/QDir>
 #include <QtNetwork/QNetworkConfiguration>
 
-#define TRANSFER_ICON           "/usr/share/icons/suru/status/scalable/transfer-progress.svg"
-#define TRANSFER_ICON_PAUSED    "/usr/share/icons/suru/status/scalable/transfer-paused.svg"
-#define TRANSFER_ICON_ERROR     "/usr/share/icons/suru/status/scalable/transfer-error.svg"
+#define TRANSFER_ICON           "transfer-progress"
+#define TRANSFER_ICON_PAUSED    "transfer-paused"
+#define TRANSFER_ICON_ERROR     "transfer-error"
 
 
 ABUpdate::ABUpdate(QObject *parent)
 
=== modified file 'upstart/address-book-service.conf.in'
--- upstart/address-book-service.conf.in	2015-09-09 19:07:42 +0000
+++ upstart/address-book-service.conf.in	2016-11-11 00:22:48 +0000
@@ -14,4 +14,4 @@
     echo "STOP `date`"
 end script
 
-exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-service
+exec $SNAP@CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-service
 
=== modified file 'upstart/address-book-updater.conf.in'
--- upstart/address-book-updater.conf.in	2015-10-09 13:57:11 +0000
+++ upstart/address-book-updater.conf.in	2016-11-11 00:22:48 +0000
@@ -4,4 +4,4 @@
 start on started address-book-service and started msyncd and started sync-monitor
 stop on runlevel [06]
 
-exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-updater --sync
+exec $SNAP@CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-updater --sync