Pull out the 'tweetctl' queue for now; these should go over control signals, and...

diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index 1078abc484a9a126b3995d9423e215a838191f59..f5c3612506c6627410dc4b48842bdd20b915cb89 100644 (file)
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -279,9 +279,6 @@ class TwitterBridgePlugin extends Plugin
 
             // Incoming statuses <- twitter
             $manager->connect('tweetin', 'TweetInQueueHandler');
-
-            // Control messages from our web interface to the import daemon
-            $manager->connect('tweetctl', 'TweetCtlQueueHandler', 'twitter');
         }
         return true;
     }

diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php
index de1ba58b0dcebb3cb45564b2804bc91658993c67..c169172b0000f980c80137fabf130ad0975473c5 100644 (file)
--- a/plugins/TwitterBridge/twittersettings.php
+++ b/plugins/TwitterBridge/twittersettings.php
@@ -285,7 +285,7 @@ class TwittersettingsAction extends ConnectSettingsAction
         }
 
         $original = clone($flink);
-        $wasReceiving = (bool)($original->notice_sync & FOREIGN_NOTICE_RECV);
+        $wasReceiving = (bool)($original->noticesync & FOREIGN_NOTICE_RECV);
         $flink->set_flags($noticesend, $noticerecv, $replysync, $friendsync);
         $result = $flink->update($original);
 
@@ -307,10 +307,7 @@ class TwittersettingsAction extends ConnectSettingsAction
      */
     function notifyDaemon($twitterUserId, $receiving)
     {
-        $data = array('for_user' => $twitterUserId,
-                      'action' => $receiving ? 'stop' : 'start');
-        $qm = QueueManager::get();
-        $qm->enqueue($data, 'twitterctl');
+        // todo... should use control signals rather than queues
     }
 
 }