aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-06-19 21:08:52 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-06-19 21:08:52 -0400
commite4b03bc316965e6e27bb88d340a5fe0b34669ca1 (patch)
tree02f12d41e2444d43131ca01deed1df61c607eb2a /src
parentmplayer and smplayer profiles (diff)
downloadfirejail-e4b03bc316965e6e27bb88d340a5fe0b34669ca1.tar.gz
firejail-e4b03bc316965e6e27bb88d340a5fe0b34669ca1.tar.zst
firejail-e4b03bc316965e6e27bb88d340a5fe0b34669ca1.zip
added calibre profile
Diffstat (limited to 'src')
-rw-r--r--src/firecfg/firecfg.config2
-rw-r--r--src/firejail/x11.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 7bac70887..1ac8234ab 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -23,6 +23,7 @@ bless
23blender 23blender
24brasero 24brasero
25brave 25brave
26calibre
26catfish 27catfish
27cherrytree 28cherrytree
28chromium 29chromium
@@ -50,6 +51,7 @@ dolphin
50dosbox 51dosbox
51dragon 52dragon
52dropbox 53dropbox
54ebook-viewer
53elinks 55elinks
54empathy 56empathy
55eog 57eog
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 5ce156603..79ebc3b1b 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -639,7 +639,7 @@ void x11_start_xpra(int argc, char **argv) {
639 639
640 // build the start command 640 // build the start command
641 char *server_argv[256] = { // rest initialyzed to NULL 641 char *server_argv[256] = { // rest initialyzed to NULL
642 "xpra", "start", display_str, "--no-daemon", 642 "xpra", "start", display_str, "--no-daemon", "--use-display",
643 }; 643 };
644 unsigned pos = 0; 644 unsigned pos = 0;
645 while (server_argv[pos] != NULL) pos++; 645 while (server_argv[pos] != NULL) pos++;
@@ -736,7 +736,7 @@ void x11_start_xpra(int argc, char **argv) {
736 } 736 }
737 737
738 // add a small delay, on some systems it takes some time for the server to start 738 // add a small delay, on some systems it takes some time for the server to start
739 sleep(1); 739 sleep(5);
740 740
741 // check X11 socket 741 // check X11 socket
742 char *fname; 742 char *fname;