roomslist: Less confusing code by using promises

src/converse-roomslist.js

@@ -163,12 +163,15 @@
                     {'model': _converse.chatboxes}
                 );
             };
-            _converse.on('bookmarksInitialized', initRoomsListView);
-            _converse.on('roomsPanelRendered', function () {
+
+            $.when(_converse.api.waitUntil('chatBoxesFetched'),
+                   _converse.api.waitUntil('roomsPanelRendered')).then(
+                function () {
                     if (_converse.allow_bookmarks) {
-                    return;
-                }
+                        _converse.api.waitUntil('bookmarksInitialized').then(initRoomsListView);
+                    } else {
                         initRoomsListView();
+                    }
                 });
 
             var afterReconnection = function () {