Merge lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Twitter into lp:~cairo-dock-team/cairo-dock-plug-ins-extras/third-party

Proposed by Eduardo Mucelli Rezende Oliveira
Status: Merged
Merged at revision: 268
Proposed branch: lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Twitter
Merge into: lp:~cairo-dock-team/cairo-dock-plug-ins-extras/third-party
Diff against target: 26 lines (+6/-1)
1 file modified
Twitter/Twitter (+6/-1)
To merge this branch: bzr merge lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Twitter
Reviewer Review Type Date Requested Status
Cairo-Dock Devs Pending
Review via email: mp+106485@code.launchpad.net

Description of the change

Twitter: Properly fixing the alert mark that was there, even after Twitter account was added. Not allowing the tweet dialog to appear if none of the networks is available.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Twitter/Twitter'
2--- Twitter/Twitter 2012-05-19 00:12:14 +0000
3+++ Twitter/Twitter 2012-05-19 00:42:25 +0000
4@@ -407,8 +407,12 @@
5 }
6 return identica_menu
7
8+ def any_active_network(self):
9+ return self.twitter.api or self.identica.api
10+
11 def set_visual_for_active_networks(self):
12 if self.twitter.api:
13+ self.icon.SetIcon(os.path.abspath("./icon")) # overwrite the alert mark "!!!"
14 if self.identica.api:
15 self.icon.SetLabel("Twitter and Identi.ca")
16 self.icon.SetIcon(os.path.abspath("./data/twitter_and_identica.png"))
17@@ -498,7 +502,8 @@
18 elif not self.message_stream.empty():
19 self.show_new_direct_messages()
20 else:
21- self.ask_for_tweet()
22+ if self.any_active_network():
23+ self.ask_for_tweet()
24
25 def on_middle_click(self):
26 self.show_home_timeline()

Subscribers

People subscribed via source and target branches