diff --git a/src/extra/AudioUploader/gui.py b/src/extra/AudioUploader/gui.py index eaacd59f..0388fa65 100644 --- a/src/extra/AudioUploader/gui.py +++ b/src/extra/AudioUploader/gui.py @@ -68,7 +68,6 @@ class audioDialog(wx.Dialog): services = [] if config.main["services"]["dropbox_token"] != "": services.append("Dropbox") - services.append("TwUp") services.append("SNDUp") return services diff --git a/src/gui/buffers/people.py b/src/gui/buffers/people.py index b2e0a8d5..f15e75c1 100644 --- a/src/gui/buffers/people.py +++ b/src/gui/buffers/people.py @@ -41,8 +41,8 @@ class peoplePanel(basePanel): self.list = widgets.list(self, _(u"User"), style=wx.LC_REPORT|wx.LC_SINGLE_SEL, size=(800, 800)) def __init__(self, parent, window, name_buffer, function, argumento=None, sound="", timeline=False): - self.type = "people" super(peoplePanel, self).__init__(parent, window, name_buffer, function, argumento=argumento, sound=sound) + self.type = "people" self.responseBtn.SetLabel(_(u"Mention")) self.retweetBtn.Disable() self.compose_function = twitter.compose.compose_followers_list diff --git a/src/twitter/buffers/stream.py b/src/twitter/buffers/stream.py index 83eb8a39..86a8c298 100644 --- a/src/twitter/buffers/stream.py +++ b/src/twitter/buffers/stream.py @@ -71,12 +71,11 @@ class streamer(TwythonStreamer): wx.PostEvent(self.parent.search_buffer("buffer", "direct_messages"), tweet_event) def check_follower(self, data): - if data["target"]["screen_name"] == self.db.settings["user_name"]: - if config.main["other_buffers"]["show_followers"] == True: - tweet_event = event.event(event.EVT_OBJECT, 1) - tweet_event.SetItem(data["source"]) - wx.PostEvent(self.parent.search_buffer("people", "followers"), tweet_event) - elif data["source"]["screen_name"] == self.db.settings["user_name"] and config.main["other_buffers"]["show_friends"] == True: + if data["target"]["screen_name"] == self.db.settings["user_name"] and config.main["other_buffers"]["show_followers"] == True: + tweet_event = event.event(event.EVT_OBJECT, 1) + tweet_event.SetItem(data["source"]) + wx.PostEvent(self.parent.search_buffer("people", "followers"), tweet_event) + elif data["source"]["screen_name"] == self.db.settings["user_name"]: tweet_event = event.event(event.EVT_OBJECT, 1) tweet_event.SetItem(data["target"]) wx.PostEvent(self.parent.search_buffer("people", "friends"), tweet_event) @@ -119,7 +118,7 @@ class streamer(TwythonStreamer): self.check_favs(data) elif "unfavorite" == data["event"] and config.main["other_buffers"]["show_favourites"] == True: self.remove_fav(data) - elif "follow" == data["event"] and config.main["other_buffers"]["show_followers"] == True: + elif "follow" == data["event"]: self.check_follower(data) elif "unfollow" == data["event"] and config.main["other_buffers"]["show_followers"] == True: self.remove_friend(data)