Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/buddy.c @ 25658:903fb6879521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Broken merge.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Tue, 27 May 2008 06:51:21 +0000
parents f34fbd06984f
children e166f9e91d6d d0ac3c438b71
comparison
equal deleted inserted replaced
25657:ff29208e03ef 25658:903fb6879521
958 958
959 g_string_free(tmp, TRUE); 959 g_string_free(tmp, TRUE);
960 } 960 }
961 #endif 961 #endif
962 } else { 962 } else {
963 gboolean multiple_resources = jbi->jb->resources && (g_hash_table_size(jbi->jb->resources) > 1); 963 gboolean multiple_resources = jbi->resources && (g_hash_table_size(jbi->resources) > 1);
964 964
965 for(resources = jbi->jb->resources; resources; resources = resources->next) { 965 for(resources = jbi->jb->resources; resources; resources = resources->next) {
966 char *purdy = NULL; 966 char *purdy = NULL;
967 jbr = resources->data; 967 jbr = resources->data;
968 968