Google plugin: use utf-8 conversion also for the cinema names

diff --git a/src/plugins/google-parser.vala b/src/plugins/google-parser.vala
index 452a044..7c93f51 100644 (file)
--- a/src/plugins/google-parser.vala
+++ b/src/plugins/google-parser.vala
@@ -163,6 +163,11 @@ public class GoogleParser : Object {
                                        continue;
                                }
                        }
+                       if (s.offset (i).has_prefix ("&")) {
+                               result += "&";
+                               i += 4;
+                               continue;
+                       }
                        result += s.substring (i, 1);
                }
 
@@ -174,7 +179,7 @@ public class GoogleParser : Object {
                expect_tag ("div"); // class=name
                expect_tag ("a"); // href="/movies?near=city&mid=..."
                expect_tag ("span"); // dir=ltr
-               var title = unescape_unicode (convert (parse_text (), -1, "utf-8", "iso-8859-1")).replace ("&", "&"); // FIXME
+               var title = unescape_unicode (convert (parse_text (), -1, "utf-8", "iso-8859-1")); // FIXME
                expect_tag ("/span");
                expect_tag ("/a");
                expect_tag ("/div");
@@ -246,7 +251,7 @@ public class GoogleParser : Object {
                expect_tag ("h2"); // class=name
                expect_tag ("a"); // href="/movies?near=city&tid=..."
                expect_tag ("span"); // dir=ltr
-               string name = convert (parse_text ().replace ("&", "&"), -1, "utf-8", "iso-8859-1"); // FIXME
+               var name = unescape_unicode (convert (parse_text (), -1, "utf-8", "iso-8859-1")); // FIXME
                expect_tag ("/span");
                expect_tag ("/a");
                expect_tag ("/h2");