gajim: Merge

[Stephan Erb]

changeset 78e8a0fdbd5f in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=78e8a0fdbd5f
description: Merge

diffstat:

 data/glade/preferences_window.glade |  1 +
 src/common/jingle_rtp.py            |  3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r b01592623c52 -r 78e8a0fdbd5f data/glade/preferences_window.glade
--- a/data/glade/preferences_window.glade       Fri Dec 11 01:11:39 2009 +0100
+++ b/data/glade/preferences_window.glade       Fri Dec 11 01:13:45 2009 +0100
@@ -2158,6 +2158,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="invisible_char">&#x25CF;</property>
+                                <signal name="changed" 
handler="stun_server_entry_changed"/>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>
diff -r b01592623c52 -r 78e8a0fdbd5f src/common/jingle_rtp.py
--- a/src/common/jingle_rtp.py  Fri Dec 11 01:11:39 2009 +0100
+++ b/src/common/jingle_rtp.py  Fri Dec 11 01:13:45 2009 +0100
@@ -16,6 +16,7 @@
 """
 
 import gobject
+import socket
 
 import xmpp
 import farsight, gst
@@ -71,7 +72,7 @@
                # pidgin and telepathy-gabble don't follow the XEP, and it 
won't work
                # due to bad controlling-mode
                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:
                        try:
                                ip = socket.getaddrinfo(stun_server, 0, 
socket.AF_UNSPEC,
_______________________________________________
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits