Make biometrics optional (#268)

Author: danirabbit

meson_options.txt

@@ -0,0 +1 @@
+option('biometrics', type : 'boolean', value : false, description : 'Include settings for fingerprint readers etc')

src/Views/UserSettingsView.vala

@@ -23,8 +23,9 @@ namespace SwitchboardPlugUserAccounts.Widgets {
 
         private UserUtils utils;
         private DeltaUser delta_user;
+#if BIOMETRICS
         private FPUtils fp_utils;
-
+#endif
         private Gtk.ListStore language_store;
         private Gtk.ListStore region_store;
 
@@ -66,11 +67,13 @@ namespace SwitchboardPlugUserAccounts.Widgets {
         construct {
             utils = new UserUtils (user, this);
             delta_user = new DeltaUser (user);
+#if BIOMETRICS
             try {
                 fp_utils = new FPUtils ();
             } catch (Error e) {
                 warning ("Fingerprint reader not available: %s", e.message);
             }
+#endif
 
             default_regions = get_default_regions ();
 
@@ -232,6 +235,7 @@ namespace SwitchboardPlugUserAccounts.Widgets {
             autologin_box.append (autologin_switch);
 
             Gtk.Box fp_box;
+#if BIOMETRICS
             if (fp_utils != null) {
                 fingerprint_button = new Gtk.Button.with_label (_("Set Up Fingerprint…")) {
                     sensitive = false
@@ -283,6 +287,7 @@ namespace SwitchboardPlugUserAccounts.Widgets {
                     }
                 });
             }
+#endif
 
             password_button = new Gtk.Button.with_label (_("Change Password…"));
             password_button.clicked.connect (() => {
@@ -409,21 +414,25 @@ namespace SwitchboardPlugUserAccounts.Widgets {
                 user_type_dropdown.sensitive = false;
                 password_button.sensitive = false;
                 autologin_switch.sensitive = false;
+#if BIOMETRICS
                 if (fp_utils != null) {
                     remove_fp_button.sensitive = false;
                     fingerprint_button.sensitive = false;
                 }
+#endif
 
                 autologin_label.secondary_text = NO_PERMISSION_STRING;
                 user_type_label.secondary_text = NO_PERMISSION_STRING;
             }
 
             lang_label.secondary_text = null;
 
+#if BIOMETRICS
             if (fp_utils != null) {
                 remove_fp_button.sensitive = current_user && fp_utils.is_enrolled ();
                 fingerprint_button.sensitive = current_user;
             }
+#endif
 
             if (current_user || allowed) {
                 full_name_entry.sensitive = true;

src/meson.build

@@ -8,11 +8,9 @@ plug_files = files(
     'Plug.vala',
     'Dialogs/AvatarDialog.vala',
     'Dialogs/ChangePasswordDialog.vala',
-    'Dialogs/FingerprintDialog.vala',
     'Dialogs/NewUserDialog.vala',
     'Misc/DeltaUser.vala',
     'Misc/UserUtils.vala',
-    'Misc/FPUtils.vala',
     'Misc/Utils.vala',
     'Views/GuestSettingsView.vala',
     'Views/MainView.vala',
@@ -29,6 +27,16 @@ run_passwd_files = files(
     'run-passwd.h'
 )
 
+args = []
+if get_option('biometrics')
+    args += '--define=BIOMETRICS'
+
+    plug_files += files(
+        'Dialogs' / 'FingerprintDialog.vala',
+        'Misc' /' FPUtils.vala'
+    )
+endif
+
 shared_module(
     meson.project_name(),
     pkgdatadir_declaration,
@@ -51,6 +59,7 @@ shared_module(
         posix_dep,
         switchboard_dep,
     ],
+    vala_args: args,
     install: true,
     install_dir : join_paths(switchboard_plugsdir, 'system')
 )