Merge branch '1.0.x' into limitdist

[quix0rs-gnu-social.git] / plugins / TwitterBridge / twittersettings.php

diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php
index de1ba58b0dcebb3cb45564b2804bc91658993c67..763a5860790b059bcfbc686f53c0517f7ddc7c70 100644 (file)
--- a/plugins/TwitterBridge/twittersettings.php
+++ b/plugins/TwitterBridge/twittersettings.php
@@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/connectsettingsaction.php';
 require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
 
 /**
@@ -45,7 +44,7 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
  *
  * @see      SettingsAction
  */
-class TwittersettingsAction extends ConnectSettingsAction
+class TwittersettingsAction extends ProfileSettingsAction
 {
     /**
      * Title of the page
@@ -285,7 +284,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 +306,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
     }
 
 }