Khurshid Alam has proposed merging
lp:~khurshid-alam/unity-settings-daemon/libnm-port into
lp:unity-settings-daemon.
Commit message:
rfkill: Add RFKill support plugin.
Unity-control-center has been ported away from libnm-glib to libnm 1.2. u-c-c
will make use of this plugin.
Requested reviews:
Sebastien Bacher (seb128)
Related bugs:
Bug #1744619 in network-manager-vpnc (Ubuntu): "Transitioning GNOME away from
libnm-glib"
https://bugs.launchpad.net/ubuntu/+source/network-manager-vpnc/+bug/1744619
For more details, see:
https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/libnm-port/+merge/366761
PPA: ppa:unity7maintainers/unity7-desktop
Community-Thread:
https://community.ubuntu.com/t/testing-of-new-wetwork-panel-in-unity-libnm-port-1-2-eoan/10792
--
Your team Unity Settings Daemon Development Team is subscribed to branch
lp:unity-settings-daemon.
=== modified file 'configure.ac'
--- configure.ac 2018-02-21 21:19:43 +
+++ configure.ac 2019-05-01 13:56:48 +
@@ -397,6 +397,21 @@
PKG_CHECK_MODULES(SHARING, gio-2.0 $NM_MODULE)
# ---
+# Rfkill
+# ---
+
+AC_ARG_ENABLE(rfkill,
+ AS_HELP_STRING([--disable-rfkill], [disable rfkill support (default: enabled)]),,
+ enable_rfkill=yes, enabled_rfkill=no)
+
+if test x"$enable_rfkill" != x"no" ; then
+ AC_CHECK_HEADERS([linux/rfkill.h],,
+ AC_MSG_ERROR([RFKill headers not found but rfkill support requested]))
+fi
+
+AM_CONDITIONAL(BUILD_RFKILL, [test x"$enable_rfkill" = x"yes"])
+
+# ---
# Enable Profiling
# ---
AC_ARG_ENABLE(profiling,
@@ -515,6 +530,7 @@
plugins/mouse/Makefile
plugins/orientation/Makefile
plugins/remote-display/Makefile
+plugins/rfkill/Makefile
plugins/screensaver-proxy/Makefile
plugins/sharing/Makefile
plugins/smartcard/Makefile
@@ -565,6 +581,7 @@
Smartcard support:${have_smartcard_support}
Cups support: ${enable_cups}
Wacom support:${have_wacom}
+RFKill support: ${enable_rfkill}
${NSS_DATABASE:+\
System nssdb: ${NSS_DATABASE}
}\
=== modified file 'plugins/Makefile.am'
--- plugins/Makefile.am 2018-02-21 21:19:43 +
+++ plugins/Makefile.am 2019-05-01 13:56:48 +
@@ -48,5 +48,11 @@
disabled_plugins += wacom
endif
+if BUILD_RFKILL
+enabled_plugins += rfkill
+else
+disabled_plugins += rfkill
+endif
+
SUBDIRS = common $(enabled_plugins)
DIST_SUBDIRS = $(SUBDIRS) $(disabled_plugins)
=== added directory 'plugins/rfkill'
=== added file 'plugins/rfkill/61-gnome-settings-daemon-rfkill.rules'
--- plugins/rfkill/61-gnome-settings-daemon-rfkill.rules 1970-01-01 00:00:00 +
+++ plugins/rfkill/61-gnome-settings-daemon-rfkill.rules 2019-05-01 13:56:48 +
@@ -0,0 +1,8 @@
+# Get access to /dev/rfkill for users
+# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
+#
+# Simplified by Kay Sievers
+# https://bugzilla.redhat.com/show_bug.cgi?id=733326
+# See also https://bugzilla.gnome.org/show_bug.cgi?id=711373
+
+KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess"
=== added file 'plugins/rfkill/Makefile.am'
--- plugins/rfkill/Makefile.am 1970-01-01 00:00:00 +
+++ plugins/rfkill/Makefile.am 2019-05-01 13:56:48 +
@@ -0,0 +1,69 @@
+plugin_name = rfkill
+
+libexec_PROGRAMS = gsd-test-rfkill
+
+gsd_test_rfkill_SOURCES = \
+ gsd-rfkill-manager.h \
+ gsd-rfkill-manager.c \
+ rfkill-glib.c \
+ rfkill-glib.h \
+ rfkill.h \
+ test-rfkill.c
+
+gsd_test_rfkill_CFLAGS = \
+ -I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
+ -I$(top_srcdir)/plugins/common\
+ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ $(PLUGIN_CFLAGS) \
+ $(SETTINGS_PLUGIN_CFLAGS)\
+ $(AM_CFLAGS)
+
+gsd_test_rfkill_LDADD = \
+ $(top_builddir)/gnome-settings-daemon/libgsd.la \
+ $(top_builddir)/plugins/common/libcommon.la \
+ $(SETTINGS_PLUGIN_LIBS)
+
+plugin_LTLIBRARIES = librfkill.la
+
+librfkill_la_SOURCES = \
+ gsd-rfkill-plugin.c \
+ gsd-rfkill-manager.h \
+ gsd-rfkill-manager.c \
+ rfkill-glib.c \
+ rfkill-glib.h \
+ rfkill.h
+
+librfkill_la_CPPFLAGS = \
+ -I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
+ -I$(top_srcdir)/data/\
+ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
+ $(AM_CPPFLAGS)
+
+librfkill_la_CFLAGS = \
+ $(PLUGIN_CFLAGS) \
+ $(RFKILL_CFLAGS) \
+ $(SETTINGS_PLUGIN_CFLAGS) \
+ $(AM_CFLAGS)
+
+librfkill_la_LDFLAGS = \
+ $(GSD_PLUGIN_LDFLAGS)
+
+librfkill_la_LIBADD = \
+ $(RFKILL_LIBS) \
+ $(SETTINGS_PLUGIN_LIBS)
+
+plugin_in_files = rfkill.gnome-settings-plugin.in
+
+plugin_DATA =
