aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-07 23:14:17 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-07 23:14:17 +0200
commitd8c5ec9c61c39c5d3f0750912a5f2ab8f3b34957 (patch)
treeef29605f82e19e3df6c28cfde03096b67578731c
parenta8d77c4892eeb68567a7a5376bbb174377c1f655 (diff)
parentbf8d2e146e7e54aed28c5656a28383ae28964c50 (diff)
downloadarctica-greeter-d8c5ec9c61c39c5d3f0750912a5f2ab8f3b34957.tar.gz
arctica-greeter-d8c5ec9c61c39c5d3f0750912a5f2ab8f3b34957.tar.bz2
arctica-greeter-d8c5ec9c61c39c5d3f0750912a5f2ab8f3b34957.zip
Merge branch 'ElyesH-master'
Attribute GH PR #22: https://github.com/ArcticaProject/arctica-greeter/pull/22
-rw-r--r--src/arctica-greeter.vala2
-rw-r--r--src/settings-daemon.vala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index 70f282f..96a98ce 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -646,7 +646,7 @@ public class ArcticaGreeter
out to relieve memory pressure."
With systemd version 239 the ulimit for RLIMIT_MEMLOCK was set to 16 MiB
- and therefore the mlockall call would fail. This is lucky becasue the subsequent mmap would not fail.
+ and therefore the mlockall call would fail. This is lucky because the subsequent mmap would not fail.
With systemd version 240 the RLIMIT_MEMLOCK is now set to 64 MiB
and now the mlockall no longer fails. However, it not possible to mmap in all
diff --git a/src/settings-daemon.vala b/src/settings-daemon.vala
index 4a7b75f..9080f3f 100644
--- a/src/settings-daemon.vala
+++ b/src/settings-daemon.vala
@@ -77,7 +77,7 @@ public class SettingsDaemon : Object
/* The power plugin does the screen saver screen blanking and disables
* the builtin X screen saver. It relies on mate-screensaver to generate
* the event to trigger this (which actually comes from mate-session).
- * We implement the mate-screensaver inteface and start the settings
+ * We implement the mate-screensaver interface and start the settings
* daemon once it is registered on the bus so mate-screensaver is not
* started when it accesses this interface */
screen_saver = new ScreenSaverInterface ();