From: Florian Zeitz <florob@babelmonkeys.de>
Date: Fri, 24 Jul 2009 20:06:02 +0000 (+0200)
Subject: Merge branch 'master' of ssh://florob@babelmonkeys.de/home/florob/projects/socialXMPP
X-Git-Url: http://cgit.babelmonkeys.de/?p=socialXMPP.git;a=commitdiff_plain;h=b11e25fa989a433439d4267c7e95f5e39a88e21b;hp=787d54ca199165ac0238ee737d906f39aa75a3ba

Merge branch 'master' of ssh://florob@babelmonkeys.de/home/florob/projects/socialXMPP
---

diff --git a/scripts/basic.js b/scripts/basic.js
index 2f816f3..e4a63cf 100644
--- a/scripts/basic.js
+++ b/scripts/basic.js
@@ -122,7 +122,7 @@ function _cbOwnVCard(e) {
 }
 
 function getVCard(jid) {
-    var id = 'getvCard'+jid2id(jid);
+    var id = connection.getUniqueId('vCardGet');
     if (roster[jid2id(jid)].vCard == "") {
 	var vCardiq = $iq({'to':jid,
 			'id':id,
@@ -136,7 +136,7 @@ function getVCard(jid) {
 }
 
 function getOwnInfo() {
-    var id = 'getvCard'+jid2id(connection.jid);
+    var id = connection.getUniqueId('vCardGet');
     var vCardiq = $iq({'to': Strophe.getBareJidFromJid(connection.jid),
 		'id': id,
 		'type': 'get'}
@@ -144,7 +144,6 @@ function getOwnInfo() {
     connection.addHandler(_cbOwnVCard, null, 'iq', 'result', id);
     connection.send(vCardiq.tree());
 }
-
 function addFriend(jid, nick) {
     roster[jid2id(jid)] = new Buddy(nick, jid);
     $('#friends').append('<div class="friend" id="'+jid2id(jid)+'"><img src="imgs/none.png" /><br /><a class="nick">'+nick+'</a></div>');