Mercurial > pidgin
comparison libpurple/protocols/jabber/jabber.c @ 24563:5cd0188892f6
Revert the part of 280dc76b which broke XMPP resources such that only those
assigned by the server would work.
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Sat, 29 Nov 2008 18:20:58 +0000 |
parents | 9bb624e345aa |
children | 6b9552b09de0 c4eb9f10ecb5 |
comparison
equal
deleted
inserted
replaced
24562:df9f962aa907 | 24563:5cd0188892f6 |
---|---|
148 | 148 |
149 static char *jabber_prep_resource(char *input) { | 149 static char *jabber_prep_resource(char *input) { |
150 char hostname[256]; /* current hostname */ | 150 char hostname[256]; /* current hostname */ |
151 | 151 |
152 /* Empty resource == don't send any */ | 152 /* Empty resource == don't send any */ |
153 if (*input == '\0' || strstr(input, "__HOSTNAME__") == NULL) | 153 if (*input == '\0') |
154 return NULL; | 154 return NULL; |
155 | 155 |
156 /* Replace __HOSTNAME__ with hostname */ | 156 /* Replace __HOSTNAME__ with hostname */ |
157 if (gethostname(hostname, sizeof(hostname) - 1)) { | 157 if (gethostname(hostname, sizeof(hostname) - 1)) { |
158 purple_debug_warning("jabber", "gethostname: %s\n", g_strerror(errno)); | 158 purple_debug_warning("jabber", "gethostname: %s\n", g_strerror(errno)); |