Merge tag 'upstream/0.16.11.git20171118' into debian/experimental

gajim/gui_interface.py

@@ -2562,6 +2562,20 @@ class Interface:
         MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
             self.msg_win_mgr.create_window(None, None, None)
 
+        # Creating plugin manager
+        from gajim import plugins
+        app.plugin_manager = plugins.PluginManager()
+        app.plugin_manager.init_plugins()
+
+        helpers.update_optional_features()
+        # prepopulate data which we are sure of; note: we do not log these info
+        for account in app.connections:
+            gajimcaps = caps_cache.capscache[
+                ('sha-1', app.caps_hash[account])]
+            gajimcaps.identities = [app.gajim_identity]
+            gajimcaps.features = app.gajim_common_features + \
+                app.gajim_optional_features[account]
+
         self.roster._before_fill()
         for account in app.connections:
             app.connections[account].load_roster_from_db()
@@ -2758,20 +2772,6 @@ class Interface:
             app.gajim_optional_features[a] = []
             app.caps_hash[a] = ''
 
-        # Creating plugin manager
-        from gajim import plugins
-        app.plugin_manager = plugins.PluginManager()
-        app.plugin_manager.init_plugins()
-
-        helpers.update_optional_features()
-        # prepopulate data which we are sure of; note: we do not log these info
-        for account in app.connections:
-            gajimcaps = caps_cache.capscache[('sha-1',
-                app.caps_hash[account])]
-            gajimcaps.identities = [app.gajim_identity]
-            gajimcaps.features = app.gajim_common_features + \
-                app.gajim_optional_features[account]
-
         self.remote_ctrl = None
 
         from gajim import network_watcher