Permalink
Browse files

Add blueman apapters config to Xfce settings dialog

This partially addresses Issue #25

Making the dialogs pluggable into Xfce's settings manager is
probably not doable right now, given that Xfce is gtk2 and
blueman is gtk3.

Closes #152
  • Loading branch information...
1 parent d4d2b4c commit 9733f33a4d590d1c676b80dec37487fed077b060 @rworkman rworkman committed with cschramm Dec 14, 2014
Showing with 30 additions and 2 deletions.
  1. +1 −0 CHANGELOG.md
  2. +6 −0 configure.ac
  3. +10 −2 data/Makefile.am
  4. +13 −0 data/blueman-adapters.desktop.in
View
@@ -16,6 +16,7 @@
* [sendto] Make thunar sendto integration optional (@rworkman / Robby Workman)
* [configure] Rename --enable-sendto to --enable-nautilus-sendto
(@rworkman / Robby Workman)
+* Add optional xfce settings entry (@rworkman / Robby Workman)
### Bugs fixed
View
@@ -135,6 +135,11 @@ AC_ARG_ENABLE(thunar-sendto,
AM_CONDITIONAL(HAVE_THUNAR, test "x$have_thunar" = "xyes")
+AC_ARG_ENABLE(xfce-settings,
+[ --enable-xfce-settings=[yes/no] Enable xfce settings entry],have_xfce=$enableval,have_xfce=yes)
+
+AM_CONDITIONAL(HAVE_XFCE, test "x$have_xfce" = "xyes")
+
dnl ----------------------------
if test $deps_check = 1; then
@@ -252,5 +257,6 @@ echo sysconfig dir : $sysconfdir
echo Policykit-1 Enabled: $polkit_val
echo Nautilus sendto plugin enabled: $have_nst
echo Thunar sendto installation enabled: $have_thunar
+echo Xfce settings entry enabled: $have_xfce
echo Dhcpd 3 configuration file: $dhconfig
echo
View
@@ -9,17 +9,24 @@ app_in_files = blueman-manager.desktop.in
app_DATA = $(app_in_files:.desktop.in=.desktop)
thunar_in_files = thunar-sendto-blueman.desktop.in
+xfce_in_files = blueman-adapters.desktop.in
if HAVE_THUNAR
@INTLTOOL_DESKTOP_RULE@
thunardir = $(datadir)/Thunar/sendto
thunar_DATA = $(thunar_in_files:.desktop.in=.desktop)
endif
+if HAVE_XFCE
+@INTLTOOL_DESKTOP_RULE@
+xfcedir = $(datadir)/applications
+xfce_DATA = $(xfce_in_files:.desktop.in=.desktop)
+endif
EXTRA_DIST = $(autostart_in_files) \
- $(app_in_files) \
- $(thunar_in_files)
+ $(app_in_files) \
+ $(thunar_in_files) \
+ $(xfce_in_files)
SUBDIRS = \
configs \
@@ -29,6 +36,7 @@ SUBDIRS = \
CLEANFILES = \
thunar-sendto-blueman.desktop \
+ blueman-adapters.desktop \
blueman-manager.desktop \
blueman.desktop \
$(BUILT_SOURCES)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+_Name=Bluetooth Adapters
+_Comment=Set Bluetooth Adapter Properties
+Exec=blueman-adapters
+Icon=blueman-device
+Terminal=false
+Type=Application
+Categories=X-XFCE;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
+StartupNotify=true
+OnlyShowIn=XFCE;
+NoDisplay=false
+X-XfceSettingsName=Bluetooth
+X-XfcePluggable=false

0 comments on commit 9733f33

Please sign in to comment.