Commit 2af1fbf4 authored by Tails developers's avatar Tails developers
Browse files

Merge remote-tracking branch 'origin/bugfix/i2p-irc-in-pidgin' into stable

parents 0b854efd 7ea051e8
......@@ -56,11 +56,12 @@
<pref name='stun_server' type='string' value=''/>
</pref>
<pref name='proxy'>
<pref name='type' type='string' value='none'/>
<pref name='host' type='string' value=''/>
<pref name='port' type='int' value='0'/>
<pref name='type' type='string' value='socks5'/>
<pref name='host' type='string' value='127.0.0.1'/>
<pref name='port' type='int' value='9050'/>
<pref name='username' type='string' value=''/>
<pref name='password' type='string' value=''/>
<pref name='socks4_remotedns' type='bool' value='1'/>
</pref>
<pref name='sound'>
<pref name='while_status' type='int' value='1'/>
......
......@@ -6,7 +6,7 @@ diff -Naur chroot.orig/usr/share/applications/pidgin.desktop chroot/usr/share/ap
Comment[zh_HK]=讓你可以透過即時通訊與好友聊天,支援 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 等等
Comment[zh_TW]=讓您可以透過即時通訊與好友聊天,支援 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 等等
-Exec=pidgin
+Exec=torsocks pidgin
+Exec=env GNOME_DESKTOP_SESSION_ID="" pidgin
Icon=pidgin
StartupNotify=true
Terminal=false
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment