1 files changed, 8 insertions, 12 deletions

diff --git a/views/default/beechat/beechat.js.php b/views/default/beechat/beechat.js.php
index 51dbbcc08..1dacb6306 100644
--- a/views/default/beechat/beechat.js.php
+++ b/views/default/beechat/beechat.js.php
@@ -631,11 +631,6 @@ BeeChat.Core.Roster = function()
 	            _items[key].icon_small = icons[key].small;
 	            _items[key].icon_tiny = icons[key].tiny;
 		}
-
-	/*        if (_items[key]) {
-	            _items[key].icon_small = icons[key].small;
-	            _items[key].icon_tiny = icons[key].tiny;
-		}*/
 	    }
 	}
     }
@@ -912,7 +907,7 @@ BeeChat.UI = {
     Resources: {
 	Paths: {
 	    ICONS: '<?php echo $vars['config']->url; ?>mod/beechat/graphics/icons/',
-	    MEMBER_PROFILE: '<?php echo $vars['url']; ?>pg/profile/'
+	    MEMBER_PROFILE: '<?php echo $vars['url']; ?>profile/'
 	},
 
 	Sounds: {
@@ -1300,8 +1295,9 @@ BeeChat.UI = {
 		var isroom = ($(this).attr('isroom') == 'true');
 		if (isroom)
 			var roster = $(this).find('div').filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.ROOMROSTER + ']');
+		var html_content = $(this).children().filter('[bareJid="' + contactBareJid + '"]').html();
 		data.chats[contactBareJid] = {
-		    'html_content': escape($(this).children().filter('[bareJid="' + contactBareJid + '"]').html()),
+		    'html_content': escape(html_content),
 		    'roster_content': isroom?escape(roster.html()):'',
 		    'isroom': $(this).attr('isroom'),
 		    'group_guid': (contactBareJid in g_beechat_rooms)?g_beechat_rooms[contactBareJid]:0,
@@ -1344,7 +1340,7 @@ BeeChat.UI = {
 		    }
 
 		    g_beechat_user.getRoster().setItems(json.contacts);
-                    self.loadRosterItemsIcons();
+                    self.loadRosterItemsIcons(false);
                     self.loadRosterItemsStatuses();
 		    g_beechat_roster_items = g_beechat_user.getRoster().getItems();
 		    BeeChat.UI.ContactsList.update(g_beechat_user.getRoster().getOnlineItems())
@@ -1417,7 +1413,7 @@ BeeChat.UI = {
     /** Function: loadRosterItemsIcons
      *
      */
-    loadRosterItemsIcons: function()
+    loadRosterItemsIcons: function(is_async)
     {
 	var data = g_beechat_user.getRoster().getItemsUsernamesAsList();
 	var self = this;
@@ -1425,7 +1421,7 @@ BeeChat.UI = {
 	$.ajax({
 		type: 'POST',
 		url: self.addActionTokens('<?php echo $vars['url'] . "action/beechat/get_icons"; ?>'),
-		async: true,
+		async: is_async,
 		cache: false,
 		data: {'beechat_roster_items_usernames': data},
 		dataType: 'json',
@@ -1472,7 +1468,7 @@ BeeChat.UI = {
 	if (!g_beechat_user.isInitialized()) {
 		//alert("load roster" + rosterItems.length);
 	    BeeChat.UI.loadRosterItemsStatuses();
-	    BeeChat.UI.loadRosterItemsIcons();
+	    BeeChat.UI.loadRosterItemsIcons(true);
 	    g_beechat_user.sendInitialPresence();
 	}
     },
@@ -1835,7 +1831,7 @@ BeeChat.UI.ScrollBoxes = {
 		scrollBoxesElm.trigger('goto', scrollBoxesElm.find('ul').children().index(scrollBoxElm));
 	    if (!isroom) {
 		    BeeChat.UI.loadRosterItemsStatuses();
-		    BeeChat.UI.loadRosterItemsIcons();
+		    BeeChat.UI.loadRosterItemsIcons(true);
 	    }
 	} else {
 	    scrollBoxesElm.trigger('goto', scrollBoxesElm.find('ul').children().index(scrollBoxElm));