*** gwibber/lib/gtk/buzz.py	2010-09-17 07:22:53.000000000 +0300
--- gwibber/lib/gtk/buzz.py	2010-12-06 13:29:06.087546000 +0200
***************
*** 108,113 ****
--- 108,129 ----
        self.account["username"] = data["displayName"]
        self.account["user_id"] = data["id"]
  
+       url = "https://www.google.com/buzz/api/auth/OAuthAuthorizeToken?oauth_token=" + self.account["access_token"] + "&domain=anonymous&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fbuzz"
+ 
+       web.open(url)
+       web.set_size_request(450, 340)
+       web.connect("title-changed", self.on_buzz_token_auth_title_change)
+ 
+     if title.get_title() == "Failure":
+       d = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR,
+         gtk.BUTTONS_OK, _("Authorization failed. Please try again."))
+       if d.run(): d.destroy()
+ 
+       web.hide()
+       self.window.resize(*self.winsize)
+ 
+   def on_buzz_token_auth_title_change(self, web=None, title=None, data=None):
+     if title.get_title() == "Success":
        self.ui.get_object("hbox_buzz_auth").hide()
        self.ui.get_object("fb_auth_done_label").set_label(_("%s has been authorized by Buzz") % str(self.account["username"]))
        self.ui.get_object("hbox_buzz_auth_done").show()
*** gwibber/microblog/buzz.py	2010-09-17 07:22:53.000000000 +0300
--- gwibber/microblog/buzz.py	2010-12-06 13:22:44.439546000 +0200
***************
*** 60,69 ****
          "sender": self._actor(data["actor"]),
      }
  
!     m["text"] = data["object"]["content"]
  
      if data.get("source", {}).get("title", 0) == "Twitter":
!       m["text"] = m["text"].split(">:", 1)[1].strip()
      
      m["html"] = m["text"]
      m["content"] = m["text"]
--- 60,80 ----
          "sender": self._actor(data["actor"]),
      }
  
!     try:
!       m["text"] = data["object"]["content"]
!     except:
!       try:
!         m["text"] = data["title"]
!       except:
!         m["text"] = ""
  
      if data.get("source", {}).get("title", 0) == "Twitter":
!       try:
!           m["text"] = m["text"].split(">:", 1)[1].strip()
!       except IndexError:
!           m["text"] = m["text"].split(": ", 1)[1].strip()
!       except:
!           m["text"] = m["text"]
      
      m["html"] = m["text"]
      m["content"] = m["text"]