Package: gaim
Version: 1:2.0.0+beta5-1
Severity: normal
Tags: patch
The attached patch fixes it.
-- System Information:
Debian Release: 4.0
APT prefers experimental
APT policy: (500, 'experimental'), (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-1-686
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Versions of packages gaim depends on:
ii gaim-data 1:2.0.0+beta5-1 multi-protocol instant messaging c
ii libaspell15 0.60.4-4 GNU Aspell spell-checker runtime l
ii libatk1.0-0 1.12.3-1 The ATK accessibility toolkit
ii libavahi-compat-howl0 0.6.15-2 Avahi Howl compatibility library
ii libc6 2.5-0exp3 GNU C Library: Shared libraries
ii libcairo2 1.2.4-4 The Cairo 2D vector graphics libra
ii libdbus-1-3 1.0.0-1 simple interprocess messaging syst
ii libdbus-glib-1-2 0.71-3 simple interprocess messaging syst
ii libfontconfig1 2.4.1-2 generic font configuration library
ii libfreetype6 2.2.1-5 FreeType 2 font engine, shared lib
ii libgcrypt11 1.2.3-2 LGPL Crypto library - runtime libr
ii libglib2.0-0 2.12.4-2 The GLib library of C routines
ii libgnutls13 1.5.3-1 the GNU TLS library - runtime libr
ii libgstreamer0.10-0 0.10.10-2 Core GStreamer libraries and eleme
ii libgtk2.0-0 2.10.6-3 The GTK+ graphical user interface
ii libgtkspell0 2.0.10-3+b1 a spell-checking addon for GTK's T
ii libice6 1:1.0.1-2 X11 Inter-Client Exchange library
ii libncursesw5 5.5-5 Shared libraries for terminal hand
ii libpango1.0-0 1.14.7-1 Layout and rendering of internatio
ii libperl5.8 5.8.8-6.1 Shared Perl library
ii libpng12-0 1.2.8rel-7 PNG library - runtime
ii libsm6 1:1.0.1-3 X11 Session Management library
ii libstartup-notification0 0.8-2 library for program launch feedbac
ii libx11-6 2:1.0.3-3 X11 client-side library
ii libxcursor1 1.1.7-4 X cursor management library
ii libxext6 1:1.0.1-2 X11 miscellaneous extension librar
ii libxfixes3 1:4.0.1-4 X11 miscellaneous 'fixes' extensio
ii libxi6 1:1.0.1-3 X11 Input extension library
ii libxinerama1 1:1.0.1-4.1 X11 Xinerama extension library
ii libxml2 2.6.27.dfsg-1 GNOME XML library
ii libxrandr2 2:1.1.0.2-4 X11 RandR extension library
ii libxrender1 1:0.9.1-3 X Rendering Extension client libra
ii libxss1 1:1.1.0-1 X11 Screen Saver extension library
ii zlib1g 1:1.2.3-13 compression library - runtime
Versions of packages gaim recommends:
pn gstreamer0.10-alsa | gstreame <none> (no description available)
pn gstreamer0.10-plugins-base <none> (no description available)
pn gstreamer0.10-plugins-good <none> (no description available)
-- no debconf information
diff -uNr gaim-2.0.0+beta5/libgaim/protocols/jabber/jabber.c
gaim-2.0.0+beta5-my/libgaim/protocols/jabber/jabber.c
--- gaim-2.0.0+beta5/libgaim/protocols/jabber/jabber.c 2006-11-10
09:24:13.000000000 +0200
+++ gaim-2.0.0+beta5-my/libgaim/protocols/jabber/jabber.c 2006-11-18
19:35:50.000000000 +0200
@@ -918,10 +918,12 @@
}
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, connect_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);
+ }
}
}
