Mercurial > ~mikael > mcabber > hg
diff mcabber/src/jabglue.c @ 403:17aa60c6dc63
Allow a different server name than the jid domain name
Sync libjabber with upstream (centericq). The libjabber patch is from
Ian Johannesen.
This allows connecting to Google Talk, for example.
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Sat, 27 Aug 2005 11:21:27 +0200 |
| parents | f8f3c7493457 |
| children | a9dd91e08eb3 |
line wrap: on
line diff
--- a/mcabber/src/jabglue.c Mon Aug 22 20:33:11 2005 +0200 +++ b/mcabber/src/jabglue.c Sat Aug 27 11:21:27 2005 +0200 @@ -114,14 +114,17 @@ char *jid = g_new(char, 3 + strlen(username) + strlen(servername) + strlen(resource)); strcpy(jid, username); - strcat(jid, "@"); - strcat(jid, servername); + if (!strchr(jid, '@')) { + strcat(jid, "@"); + strcat(jid, servername); + } strcat(jid, "/"); strcat(jid, resource); return jid; } -jconn jb_connect(const char *jid, unsigned int port, int ssl, const char *pass) +jconn jb_connect(const char *jid, const char *server, unsigned int port, + int ssl, const char *pass) { if (!port) { if (ssl) @@ -133,7 +136,7 @@ jb_disconnect(); s_id = 1; - jc = jab_new((char*)jid, (char*)pass, port, ssl); + jc = jab_new((char*)jid, (char*)pass, (char*)server, port, ssl); /* These 3 functions can deal with a NULL jc, no worry... */ jab_logger(jc, logger);