optionally queue jabber confirmations

darcs-hash:20080706035707-84dde-5403fe9bcb017c401fe5847527628df548e54499.gz

1 files changed, 7 insertions, 9 deletions

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 4ad63e1cc..bad0bc18a 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -185,12 +185,12 @@ class ImsettingsAction extends SettingsAction {
 			return;
 		}
 
-		# XXX: queue for offline sending
-
-		jabber_confirm_address($confirm->code,
-							   $user->nickname,
-							   $jabber);
-
+		if (!common_config('queue', 'enabled')) {
+			jabber_confirm_address($confirm->code,
+								   $user->nickname,
+								   $jabber);
+		}
+			
 		# XXX: I18N
 
 		$msg = 'A confirmation code was sent to the IM address you added. ' .
@@ -246,9 +246,7 @@ class ImsettingsAction extends SettingsAction {
 		}
 		$user->query('COMMIT');
 
-		# Unsubscribe to the old address
-
-		jabber_special_presence('unsubscribe', $jabber);
+		# XXX: unsubscribe to the old address
 
 		$this->show_form(_t('The address was removed.'), TRUE);
 	}