Merge lp:~markjtully/gwibber/images-links into lp:gwibber

[Mark Tully]

Removed the superfluous 'Image' from tweets in the image stream which used imgpreview() to get their thumbnail

=== modified file 'gwibber/microblog/util/__init__.py'
--- gwibber/microblog/util/__init__.py	2012-03-20 16:31:03 +0000
+++ gwibber/microblog/util/__init__.py	2012-03-27 20:56:18 +0000
@@ -69,7 +69,7 @@
   
   # If the text is a direct link to a jpg
   if text.endswith((".jpg", ".gif", ".png", ".bmp")):
-     images.append({"src": text, "url": text})
+     images.append({"src": text, "url": None})
      return images
   
   # For pic.twitter.com images not wrapped in media entities
@@ -84,7 +84,7 @@
     end = content.index(':small"><img') + 6
 
     image = content[start:end]
-    images.append({"src": image, "url": text})
+    images.append({"src": image, "url": None})
     return images
 
   if "instagr.am" in text:
@@ -93,7 +93,7 @@
     resp, content = httplib2.Http().request(thumb)
     thumb = resp["content-location"]
     
-    images.append({"src": thumb, "url": text})
+    images.append({"src": thumb, "url": None})
     return images
   
   thumbre = {
@@ -149,9 +149,9 @@
   for r, u in zip(thumbre, thumburi):
     for match in re.finditer(thumbre[r], text):
       if r == 'tweetphoto' or r == 'pic.gd' or r == 'moby.to':
-        images.append({"src": thumburi[u].replace('@', match.group(0)) , "url": text})
+        images.append({"src": thumburi[u].replace('@', match.group(0)) , "url": None})
       else:
-        images.append({"src": thumburi[u].replace('@', match.group(1)) , "url": text})
+        images.append({"src": thumburi[u].replace('@', match.group(1)) , "url": None})
   return images
 
 def videopreview(text):