aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac11
-rw-r--r--debian/control2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/desktop.vala20
-rw-r--r--src/phone.vala8
5 files changed, 37 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 7dfa45d..65a0155 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,8 +19,15 @@ GIO_REQUIRED_VERSION=2.36
URL_DISPATCHER_1_REQUIRED_VERSION=1
PKG_CHECK_MODULES(SERVICE_DEPS, [glib-2.0 >= $GLIB_REQUIRED_VERSION
- gio-unix-2.0 >= $GIO_REQUIRED_VERSION
- url-dispatcher-1 >= $URL_DISPATCHER_1_REQUIRED_VERSION])
+ gio-unix-2.0 >= $GIO_REQUIRED_VERSION])
+
+PKG_CHECK_EXISTS(url-dispatcher-1,
+ [have_urldispatcher="yes"],
+ [have_urldispatcher="no"])
+
+if test "x$have_urldispatcher" == "xyes"; then
+ PKG_CHECK_MODULES(URL_DISPATCHER, [url-dispatcher-1 >= $URL_DISPATCHER_1_REQUIRED_VERSION])
+fi
SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
AC_SUBST(SYSTEMD_USERDIR)
diff --git a/debian/control b/debian/control
index 0af5bc0..02a644b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9.0),
dh-systemd,
gnome-common,
libglib2.0-dev (>= 2.32.0),
- liburl-dispatcher1-dev,
+ liburl-dispatcher1-dev | hello,
systemd [linux-any],
valac (>= 0.20),
Standards-Version: 4.1.1
diff --git a/src/Makefile.am b/src/Makefile.am
index 245b0f2..44d6406 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,9 +27,11 @@ ayatana_indicator_bluetooth_service_CFLAGS = \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-DLOCALE_DIR=\"$(datadir)/locale\" \
-w \
+ $(URL_DISPATCHER_CFLAGS) \
$(SERVICE_DEPS_CFLAGS)
ayatana_indicator_bluetooth_service_LDADD = \
+ $(URL_DISPATCHER_LIBS) \
$(SERVICE_DEPS_LIBS)
CLEANFILES = \
diff --git a/src/desktop.vala b/src/desktop.vala
index 4186daa..7109874 100644
--- a/src/desktop.vala
+++ b/src/desktop.vala
@@ -226,12 +226,26 @@ class Desktop: Profile
void show_settings (string panel)
{
- if (Environment.get_variable ("MIR_SOCKET") != null)
- UrlDispatch.send ("settings:///system/bluetooth");
- else if (is_desktop ("Unity") && Environment.find_program_in_path ("unity-control-center") != null)
+
+#if HAS_URLDISPATCHER
+
+ if (Environment.get_variable ("MIR_SOCKET") != null)
+ {
+ UrlDispatch.send ("settings:///system/bluetooth");
+
+ return;
+ }
+
+#endif
+
+ if (is_desktop ("Unity") && Environment.find_program_in_path ("unity-control-center") != null)
+ {
spawn_command_line_async ("unity-control-center " + panel);
+ }
else
+ {
spawn_command_line_async ("gnome-control-center " + panel);
+ }
}
Action create_discoverable_action (Bluetooth bluetooth)
diff --git a/src/phone.vala b/src/phone.vala
index 2b0b96b..cce016e 100644
--- a/src/phone.vala
+++ b/src/phone.vala
@@ -62,7 +62,15 @@ class Phone: Profile
void show_settings (string panel)
{
+
+#if HAS_URLDISPATCHER
+
UrlDispatch.send ("settings:///system/bluetooth");
+
+#endif
+
+ return;
+
}
Action create_settings_action ()