Merge branch 'feature/10383-Options_for_Pidgin' into devel

Fix-committed: #10383

Merge branch 'feature/10383-Options_for_Pidgin' into devel
Fix-committed: #10383
75675e0a · anonym · aeee0d93 · 481fdb43 · 75675e0a
Commit 75675e0a authored Jan 03, 2016 by anonym
--- a/config/chroot_local-includes/usr/local/bin/pidgin
+++ b/config/chroot_local-includes/usr/local/bin/pidgin
@@ -2,4 +2,4 @@

 # Start Pidgin with the GNOME integration disabled, so that the
 # "Global proxy configuration" is used, which we set to use Tor
-exec env GNOME_DESKTOP_SESSION_ID="" /usr/bin/pidgin
+exec env GNOME_DESKTOP_SESSION_ID="" /usr/bin/pidgin "${@}"