Only fetch bookmarks once chatboxes can be handled.

spec/bookmarks.js

@@ -320,7 +320,7 @@
                 sent_stanza = iq;
                 IQ_id = sendIQ.bind(this)(iq, callback, errback);
             });
-            converse.emit('connected');
+            converse.emit('chatBoxesFetched');
 
             /* Client requests all items
              * -------------------------
@@ -395,7 +395,7 @@
                 spyOn(converse.connection, 'sendIQ').andCallFake(function (iq, callback, errback) {
                     IQ_id = sendIQ.bind(this)(iq, callback, errback);
                 });
-                converse.emit('connected');
+                converse.emit('chatBoxesFetched');
                 var stanza = $iq({'to': converse.connection.jid, 'type':'result', 'id':IQ_id})
                     .c('pubsub', {'xmlns': Strophe.NS.PUBSUB})
                         .c('items', {'node': 'storage:bookmarks'})

src/converse-bookmarks.js

@@ -365,8 +365,7 @@
                 );
                 converse.bookmarks.fetchBookmarks();
             };
-            converse.on('connected', converse.initBookmarks);
-            converse.on('reconnected', converse.initBookmarks);
+            converse.on('chatBoxesFetched', converse.initBookmarks);
         }
     });
 }));