diff --git a/src/Conf.defaults b/src/Conf.defaults index 76b33dee..55d60688 100644 --- a/src/Conf.defaults +++ b/src/Conf.defaults @@ -14,7 +14,7 @@ announce_stream_status = boolean(default=True) retweet_mode = string(default="ask") persist_size = integer(default=0) show_screen_names = boolean(default=False) -buffer_order = list(default=list('home','mentions','dm','sent_dm','sent_tweets','favorites','followers','friends','blocks','muted','events')) +buffer_order = list(default=list('home','mentions', 'dm', 'sent_tweets','favorites','followers','friends','blocks','muted','events')) [sound] volume = float(default=1.0) diff --git a/src/controller/settings.py b/src/controller/settings.py index 3646582d..f4737476 100644 --- a/src/controller/settings.py +++ b/src/controller/settings.py @@ -282,7 +282,6 @@ class accountSettingsController(globalSettingsController): all_buffers['home']=_(u"Home") all_buffers['mentions']=_(u"Mentions") all_buffers['dm']=_(u"Direct Messages") - all_buffers['sent_dm']=_(u"Sent direct messages") all_buffers['sent_tweets']=_(u"Sent tweets") all_buffers['favorites']=_(u"Likes") all_buffers['followers']=_(u"Followers") @@ -303,27 +302,4 @@ class accountSettingsController(globalSettingsController): def toggle_buffer_active(self, ev): change = self.dialog.buffers.get_event(ev) if change == True: - self.dialog.buffers.change_selected_item() - -# def manage_pocket(self, *args, **kwargs): -# if self.dialog.services.get_pocket_status() == _(u"Connect your Pocket account"): -# self.connect_pocket() -# else: -# self.disconnect_pocket() - -# def connect_pocket(self): -# dlg = self.dialog.services.show_pocket_dialog() -# if dlg == widgetUtils.YES: -# request_token = pocket.Pocket.get_request_token(consumer_key=keys.keyring.get("pocket_consumer_key"), redirect_uri="http://127.0.0.1:8080") -# auth_url = pocket.Pocket.get_auth_url(code=request_token, redirect_uri="http://127.0.0.1:8080") -# webbrowser.open_new_tab(auth_url) -# httpd = BaseHTTPServer.HTTPServer(('127.0.0.1', 8080), authorisationHandler.handler) -# while authorisationHandler.logged == False: -# httpd.handle_request() -# user_credentials = pocket.Pocket.get_credentials(consumer_key=keys.keyring.get("pocket_consumer_key"), code=request_token) -# self.dialog.services.set_pocket(True) -# self.config["services"]["pocket_access_token"] = user_credentials["access_token"] - - def disconnect_dropbox(self): - self.config["services"]["pocket_access_token"] = "" - self.dialog.services.set_pocket(False) + self.dialog.buffers.change_selected_item() \ No newline at end of file