From 1a62d1b49378bba4b69476282b9a5d0e03073405 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 16 Jun 2010 16:00:54 -0400
Subject: [PATCH] Use presence of IM plugins to decide if "IM" options should
 be available

---
 actions/subscriptions.php     | 8 +++++---
 lib/connectsettingsaction.php | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 7b10b3425b..da563a218f 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -185,7 +185,9 @@ class SubscriptionsListItem extends SubscriptionListItem
             return;
         }
 
-        if (!common_config('xmpp', 'enabled') && !common_config('sms', 'enabled')) {
+        $transports = array();
+        Event::handle('GetImTransports', array(&$transports));
+        if (!$transports && !common_config('sms', 'enabled')) {
             return;
         }
 
@@ -195,7 +197,7 @@ class SubscriptionsListItem extends SubscriptionListItem
                                           'action' => common_local_url('subedit')));
         $this->out->hidden('token', common_session_token());
         $this->out->hidden('profile', $this->profile->id);
-        if (common_config('xmpp', 'enabled')) {
+        if ($transports) {
             $attrs = array('name' => 'jabber',
                            'type' => 'checkbox',
                            'class' => 'checkbox',
@@ -205,7 +207,7 @@ class SubscriptionsListItem extends SubscriptionListItem
             }
 
             $this->out->element('input', $attrs);
-            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('Jabber'));
+            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('IM'));
         } else {
             $this->out->hidden('jabber', $sub->jabber);
         }
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index c3a88be552..5d62fc56b3 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -105,7 +105,9 @@ class ConnectSettingsNav extends Widget
 
             # action => array('prompt', 'title')
             $menu = array();
-            if (Event::handle('GetImTransports', array(&$transports))) {
+            $transports = array();
+            Event::handle('GetImTransports', array(&$transports));
+            if ($transports) {
                 $menu['imsettings'] =
                   array(_('IM'),
                         _('Updates by instant messenger (IM)'));