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

[Sam Weston]

[Sam Weston (cablespaghetti)]

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.

[lp:~cablespaghetti/gwibber/retweetbugfix]

478. By Sam Weston <sam@mal> on 2009-10-31

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

479. By Sam Weston <sam@mal> on 2009-10-31

Merge from lp:gwibber 478

=== 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 @@
   @classmethod
   def action(self, w, client, msg):
     if not client.preferences["global_retweet"]:
-      client.reply_target = msg
+      client.reply_target = None
       client.target_bar.set_account(msg.account)
       client.target_bar.show()
 

=== 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 @@
       
       if self.reply_target:
         args.append("message://" + self.reply_target.gwibber_path)
-
-      self.send(self.target_bar.get_account(), args, True)
+        self.send(self.target_bar.get_account(), args, True)
+      else:
+        self.send(self.target_bar.get_account(), [text])
+  
       self.reply_target = None
       self.target_bar.hide()
     

=== 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 @@
   -webkit-background-size: 100% 100%;
   background-image: url('');
   background-repeat: no-repeat;
-  -webkit-border-radius: 3px;
   -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)));
 }