--- cover.py.old	2009-10-31 19:41:45.625839994 +0100
+++ cover.py	2009-11-01 01:33:14.584105452 +0100
@@ -239,8 +239,8 @@
         
         
         self.select = gtk.combo_box_new_text()
-        self.select.append_text(_("From Amazon"))
         self.select.append_text(_("From Google Image"))
+        self.select.append_text(_("From Amazon"))
         self.select.set_active(0)
         self.select.connect("changed",self.change_source)
         
@@ -337,9 +337,9 @@
         
         self.show_all()
         if self.select.get_active()==0:
-            gobject.idle_add(self.on_search_amazon,page)   
-        else:
             gobject.idle_add(self.on_search_google,page)  
+        else:
+            gobject.idle_add(self.on_search_amazon,page)   
         
         
     def on_search_google(self,page):
@@ -349,14 +349,15 @@
         else:
             g_page = (page-2)*16
         
-        url = "http://images.google.com/images?svnum=10&hl=fr&lr=&start=%d&safe=off&q=%s"%(g_page,quote(art))
+        url = "http://images.google.com/images?svnum=10&hl=es&lr=&start=%d&safe=off&q=%s"%(g_page,quote(art))
         
         self.download_thread.fetch_url(url,self.on_search_google_cb,page)
             
     def on_search_google_cb(self,html_handler,page):
         
         html = html_handler.read()
-        js_images = re.findall('[,\[]\[".*?,"1",\[\],""\]',html, re.S)
+        #js_images = re.findall('[,\[]\[".*?,"1",\[\],""\]',html, re.S)
+        js_images = re.findall('\[\"/imgres[^"]*",\"[^"]*",\"[^"]*",\"([^"]*)",\"[^"]*",\"[^"]*",\"([^"]*)",\"[^"]*",\"[^"]*",\"([^"]*)",',html, re.S)
         if not js_images : 
             self.logwarn("Perhaps Google page structure has changed")
             self.fail_fetch()
@@ -370,12 +371,12 @@
 
         items = []
         for jsimg in js_images:
-            info = [ info.replace('"','') for info in re.findall('".*?"', jsimg, re.S) ]
-            url = str(info[3])
-            title = info[6]
-            title = unicode(title,errors="ignore")
-            title = re.sub("<.*?>","",title)
-            items.append((url, title ,""))
+            info = jsimg[1]
+            url = str(jsimg[0])
+            title = jsimg[2]
+            #title = unicode(title,errors="ignore")
+            #title = re.sub("<.*?>","",title)
+            items.append((url, title , info))
             
         self.populate(page,items)