Merge lp:~cablespaghetti/gwibber/retweetbugfix into lp:gwibber

Proposed by Sam Weston
Status: Merged
Merge reported by: Ryan Paul
Merged at revision: not available
Proposed branch: lp:~cablespaghetti/gwibber/retweetbugfix
Merge into: lp:gwibber
Diff against target: 40 lines
3 files modified
gwibber/actions.py (+1/-1)
gwibber/client.py (+4/-2)
ui/templates/defaultcss.mako (+0/-1)
To merge this branch: bzr merge lp:~cablespaghetti/gwibber/retweetbugfix
Reviewer Review Type Date Requested Status
gwibber-committers Pending
Review via email: mp+13866@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sam Weston (cablespaghetti) wrote :

The changes fix this bug:
https://bugs.launchpad.net/gwibber/+bug/404939

However I only have a twitter account and so can only guarantee that the changes work with twitter. That said, I haven't changed anything that should affect other services.

I hope I've done this right as I have no prior experience with bzr or launchpad.

478. By Sam Weston <sam@mal>

Fix for display pictures not showing in ubuntu (bug 454526)

479. By Sam Weston <sam@mal>

Merge from lp:gwibber 478

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gwibber/actions.py'
--- gwibber/actions.py 2009-09-24 15:06:26 +0000
+++ gwibber/actions.py 2009-10-31 21:53:09 +0000
@@ -55,7 +55,7 @@
55 @classmethod55 @classmethod
56 def action(self, w, client, msg):56 def action(self, w, client, msg):
57 if not client.preferences["global_retweet"]:57 if not client.preferences["global_retweet"]:
58 client.reply_target = msg58 client.reply_target = None
59 client.target_bar.set_account(msg.account)59 client.target_bar.set_account(msg.account)
60 client.target_bar.show()60 client.target_bar.show()
6161
6262
=== modified file 'gwibber/client.py'
--- gwibber/client.py 2009-10-22 19:37:29 +0000
+++ gwibber/client.py 2009-10-31 21:53:09 +0000
@@ -731,8 +731,10 @@
731 731
732 if self.reply_target:732 if self.reply_target:
733 args.append("message://" + self.reply_target.gwibber_path)733 args.append("message://" + self.reply_target.gwibber_path)
734734 self.send(self.target_bar.get_account(), args, True)
735 self.send(self.target_bar.get_account(), args, True)735 else:
736 self.send(self.target_bar.get_account(), [text])
737
736 self.reply_target = None738 self.reply_target = None
737 self.target_bar.hide()739 self.target_bar.hide()
738 740
739741
=== modified file 'ui/templates/defaultcss.mako'
--- ui/templates/defaultcss.mako 2009-10-01 03:36:53 +0000
+++ ui/templates/defaultcss.mako 2009-10-31 21:53:09 +0000
@@ -48,7 +48,6 @@
48 -webkit-background-size: 100% 100%;48 -webkit-background-size: 100% 100%;
49 background-image: url('');49 background-image: url('');
50 background-repeat: no-repeat;50 background-repeat: no-repeat;
51 -webkit-border-radius: 3px;
52 -webkit-box-reflect:below 0px -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.6, transparent), to(rgba(0,0,0, 0.6)));51 -webkit-box-reflect:below 0px -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.6, transparent), to(rgba(0,0,0, 0.6)));
53}52}
5453

Subscribers

People subscribed via source and target branches