[Gaim-commits] SF.net SVN: gaim: [17788] trunk

[<ebl...@us...>]

Revision: 17788
          http://svn.sourceforge.net/gaim/?rev=17788&view=rev
Author:   eblanton
Date:     2006-11-19 19:57:47 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
This patch causes jabber to use DNS SRV lookups when registering
jabber accounts.  Thanks to George-Cristian B?\195?\174rzan for this.  From
Debian Bug #399230.

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/libgaim/protocols/jabber/jabber.c

Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-11-20 02:56:35 UTC (rev 17787)
+++ trunk/COPYRIGHT	2006-11-20 03:57:47 UTC (rev 17788)
@@ -26,6 +26,7 @@
 Brian Bernas
 Paul Betts
 Jonas Birmé
+George-Cristian Bîrzan
 Eric Blade
 Ethan Blanton
 Joshua Blanton

Modified: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c	2006-11-20 02:56:35 UTC (rev 17787)
+++ trunk/libgaim/protocols/jabber/jabber.c	2006-11-20 03:57:47 UTC (rev 17788)
@@ -926,10 +926,17 @@
 	}
 
 	if(!js->gsc) {
-		if (gaim_proxy_connect(gc, account, server,
-				gaim_account_get_int(account, "port", 5222),
-				jabber_login_callback, gc) == NULL)
-			gaim_connection_error(gc, _("Unable to create socket"));
+		if (connect_server[0]) {
+			jabber_login_connect(js, server,
+			                     gaim_account_get_int(account,
+			                                          "port", 5222));
+		} else {
+			js->srv_query_data = gaim_srv_resolve("xmpp-client",
+			                                      "tcp",
+			                                      js->user->domain,
+			                                      srv_resolved_cb,
+			                                      js);
+		}
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.