From 2da62b5c171a624009c4257c37d91f5d0dfe9e78 Mon Sep 17 00:00:00 2001
From: Jefry Lagrange <jefry.reyes@gmail.com>
Date: Sat, 23 Feb 2013 11:41:36 -0400
Subject: [PATCH] Ask for discovery information (and archive) after SM is
 enabled. Fixes #7299

---
 src/common/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/connection.py b/src/common/connection.py
index 30465df22..0ab527650 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1660,7 +1660,7 @@ class Connection(CommonConnection, ConnectionHandlers):
 
         # If we are not resuming, we ask for discovery info
         # and archiving preferences
-        if not self.sm.resuming:
+        if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled):
             self.request_message_archiving_preferences()
             self.discoverInfo(gajim.config.get_per('accounts', self.name,
                 'hostname'), id_prefix='Gajim_')