Merge lp:~sil/gwibber/shorten-urls-async-521974 into lp:gwibber

[Stuart Langridge]

[Stuart Langridge (sil)]

Insert a placeholder character when pasting a URL for shortening, and then asynchronously replace the placeholder character with the shortened URL.

Easier to test if your network connection is being slow, so go and download some films over bittorrent or something and then try pasting a long URL into the post entry and continuing to type while it's fetching the shortened version.

=== modified file 'gwibber/gwui.py'
--- gwibber/gwui.py	2010-02-14 03:59:00 +0000
+++ gwibber/gwui.py	2010-02-15 02:35:24 +0000
@@ -844,9 +844,30 @@
         buf = self.get_buffer()
         buf.stop_emission("insert-text")
         service = self.model.settings["urlshorter"] or "is.gd"
-        short = self.shortener.Shorten(text, service)
-        buf.insert(iter, short)
-
+        
+        def add_shortened(shortened_url):
+            "Internal add-shortened-url-to-buffer function: a closure"
+            iter_start = buf.get_iter_at_mark(mark_start)
+            iter_end = buf.get_iter_at_mark(mark_end)
+            buf.delete(iter_start, iter_end)
+            buf.insert(iter_start, shortened_url)
+        def error_shortened(dbus_exc):
+            "Internal shortening-url-died function: a closure"
+            iter = buf.get_iter_at_mark(mark)
+            buf.insert(iter, text) # shortening failed
+        
+        # set a mark at iter, so that the callback knows where to insert
+        mark_start = buf.create_mark(None, iter, True)
+        # insert a placeholder character
+        buf.insert(iter, u"\u2328")
+        # can't just get_insert() because that gets the *named* mark "insert"
+        # and we want an anonymous mark so it won't get changed later
+        iter_end = buf.get_iter_at_mark(buf.get_insert())
+        mark_end = buf.create_mark(None, iter_end, True)
+        self.shortener.Shorten(text, service,
+            reply_handler=add_shortened, 
+            error_handler=error_shortened)
+        
   def set_overlay_text(self, text):
     self.pango_overlay.set_markup(self.overlay_text % (self.overlay_color, text))