copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge

This commit is contained in:
Stephan Erb 2009-12-11 01:13:45 +01:00
parent 27c101eb55 b7aa05a684
commit df7e278ed1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/glade/preferences_window.glade
View File

@ -2158,6 +2158,7 @@ $T will be replaced by auto-not-available timeout</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property> <property name="invisible_char">&#x25CF;</property>
<signal name="changed" handler="stun_server_entry_changed"/>
</widget> </widget>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>

3
src/common/jingle_rtp.py
View File

@ -16,6 +16,7 @@ Handles Jingle RTP sessions (XEP 0167)
""" """
import gobject import gobject
import socket
import xmpp import xmpp
import farsight, gst import farsight, gst
@ -71,7 +72,7 @@ class JingleRTPContent(JingleContent):
# pidgin and telepathy-gabble don't follow the XEP, and it won't work # pidgin and telepathy-gabble don't follow the XEP, and it won't work
# due to bad controlling-mode # due to bad controlling-mode
params = {'controlling-mode': self.session.weinitiate, 'debug': False} params = {'controlling-mode': self.session.weinitiate, 'debug': False}
stun_server = gajim.config.get('stun-server') stun_server = gajim.config.get('stun_server')
if stun_server: if stun_server:
try: try:
ip = socket.getaddrinfo(stun_server, 0, socket.AF_UNSPEC, ip = socket.getaddrinfo(stun_server, 0, socket.AF_UNSPEC,