public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pantheon.switchboard-plug-security-privacy: 2.2.1 -> 2.2.2

Browse Source 
https://github.com/elementary/switchboard-plug-security-privacy/releases/tag/2.2.2
This commit is contained in:
worldofpeace 2019-10-31 17:51:46 -04:00
parent e094c1be6e
commit 8901fab9ff
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "switchboard-plug-security-privacy"; pname = "switchboard-plug-security-privacy";
version = "2.2.1"; version = "2.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0k2bq7l0m7qfpy1mkb3qvsinqd8n4lp0vwz3x64wlgfn2qipm1fn"; sha256 = "1dwq9rqswgnnglhrgcpvrp6shn3pb4x8f8f23x84sqakb430idp7";
}; };
passthru = { passthru = {
@ -51,8 +51,6 @@ stdenv.mkDerivation rec {
zeitgeist zeitgeist
]; ];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
patches = [ patches = [
./hardcode-gsettings.patch ./hardcode-gsettings.patch
]; ];

15
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch
View File

@ -1,25 +1,22 @@
diff --git a/src/Views/FirewallPanel.vala b/src/Views/FirewallPanel.vala diff --git a/src/Views/FirewallPanel.vala b/src/Views/FirewallPanel.vala
index 994c4d1..5702de2 100644 index 0335c29..481b1c8 100644
--- a/src/Views/FirewallPanel.vala --- a/src/Views/FirewallPanel.vala
+++ b/src/Views/FirewallPanel.vala +++ b/src/Views/FirewallPanel.vala
@@ -49,10 +49,13 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage { @@ -49,7 +49,11 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage {
} }
construct { construct {
- settings = new Settings ("io.elementary.switchboard.security-privacy"); - settings = new Settings ("io.elementary.switchboard.security-privacy");
+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); + SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
+ SettingsSchema security_privacy_schema = sss.lookup ("io.elementary.switchboard.security-privacy", false); + SettingsSchema security_privacy_schema = sss.lookup ("io.elementary.switchboard.security-privacy", false);
+
+ settings = new Settings.full (security_privacy_schema, null, null); + settings = new Settings.full (security_privacy_schema, null, null);
+ +
disabled_rules = new Gee.HashMap<string, UFWHelpers.Rule> (); disabled_rules = new Gee.HashMap<string, UFWHelpers.Rule> ();
load_disabled_rules (); load_disabled_rules ();
-
+
status_switch.notify["active"].connect (() => {
if (loading == false) {
view.sensitive = status_switch.active;
diff --git a/src/Views/LockPanel.vala b/src/Views/LockPanel.vala diff --git a/src/Views/LockPanel.vala b/src/Views/LockPanel.vala
index 081cf10..42f6118 100644 index 4f523f9..7135a83 100644
--- a/src/Views/LockPanel.vala --- a/src/Views/LockPanel.vala
+++ b/src/Views/LockPanel.vala +++ b/src/Views/LockPanel.vala
@@ -30,7 +30,10 @@ public class SecurityPrivacy.LockPanel : Granite.SimpleSettingsPage { @@ -30,7 +30,10 @@ public class SecurityPrivacy.LockPanel : Granite.SimpleSettingsPage {
@ -32,5 +29,5 @@ index 081cf10..42f6118 100644
+ +
+ locker = new Settings.full (locker_schema, null, null); + locker = new Settings.full (locker_schema, null, null);
var lock_suspend_label = new Gtk.Label (_("Lock on sleep:")); var lock_suspend_label = new Gtk.Label (_("Lock on suspend:"));
var lock_suspend_switch = new Gtk.Switch (); var lock_suspend_switch = new Gtk.Switch ();