aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2022-04-25 15:44:10 -0400
committerLibravatar netblue30 <netblue30@protonmail.com>2022-04-25 15:44:10 -0400
commit95aa71c073cafa5a78e93d2c798bc12cc9075b0f (patch)
tree9627fc1ff3d51eca59cab6f27ed3b922fcb4cafa
parentMerge branch 'master' of ssh://github.com/netblue30/firejail (diff)
downloadfirejail-95aa71c073cafa5a78e93d2c798bc12cc9075b0f.tar.gz
firejail-95aa71c073cafa5a78e93d2c798bc12cc9075b0f.tar.zst
firejail-95aa71c073cafa5a78e93d2c798bc12cc9075b0f.zip
merges, fix compile
-rw-r--r--README2
-rw-r--r--src/fzenity/main.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/README b/README
index 4d4871da2..335da3fa3 100644
--- a/README
+++ b/README
@@ -712,6 +712,8 @@ mirabellette (https://github.com/mirabellette)
712 - add comment to thunderbird.profile to allow Firefox to load profiles 712 - add comment to thunderbird.profile to allow Firefox to load profiles
713mjudtmann (https://github.com/mjudtmann) 713mjudtmann (https://github.com/mjudtmann)
714 - lock firejail configuration in disable-mgmt.inc 714 - lock firejail configuration in disable-mgmt.inc
715m00nwtchr (https://github.com/m00nwtchr)
716 - Whitelist electron-flags.conf for all versions of electron
715mustaqimM (https://github.com/mustaqimM) 717mustaqimM (https://github.com/mustaqimM)
716 - added profile for Nylas Mail 718 - added profile for Nylas Mail
717n1trux (https://github.com/n1trux) 719n1trux (https://github.com/n1trux)
diff --git a/src/fzenity/main.c b/src/fzenity/main.c
index 4a0d3abac..9d897b503 100644
--- a/src/fzenity/main.c
+++ b/src/fzenity/main.c
@@ -89,7 +89,7 @@ char *print_line(char *in, int col) {
89 89
90void paginate(char *in) { 90void paginate(char *in) {
91 struct winsize w; 91 struct winsize w;
92 int col = 80; 92 unsigned col = 80;
93 if (ioctl(0, TIOCGWINSZ, &w) == 0) 93 if (ioctl(0, TIOCGWINSZ, &w) == 0)
94 col = w.ws_col; 94 col = w.ws_col;
95 95