diff options
| author | Xan Lopez <xan@igalia.com> | 2012-08-07 21:28:21 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2012-08-07 21:28:21 +0800 |
| commit | 57b873b72f880e85fc0abd7ae26d627e1578a028 (patch) | |
| tree | 20992ed907b712693ad8b19a6a187508317033b2 /embed/ephy-embed-private.h | |
| parent | eea17ad5975842ba9a6c3e5ff0df08592ea2f5ee (diff) | |
| download | gsoc2013-epiphany-57b873b72f880e85fc0abd7ae26d627e1578a028.tar gsoc2013-epiphany-57b873b72f880e85fc0abd7ae26d627e1578a028.tar.gz gsoc2013-epiphany-57b873b72f880e85fc0abd7ae26d627e1578a028.tar.bz2 gsoc2013-epiphany-57b873b72f880e85fc0abd7ae26d627e1578a028.tar.lz gsoc2013-epiphany-57b873b72f880e85fc0abd7ae26d627e1578a028.tar.xz gsoc2013-epiphany-57b873b72f880e85fc0abd7ae26d627e1578a028.tar.zst gsoc2013-epiphany-57b873b72f880e85fc0abd7ae26d627e1578a028.zip | |
ephy-web-view: do autosearch foo.bar strings where bar is not a TLD
Using the new SoupTLD methods. Had to split the non-search regexp in
two so that we can reuse its 'is this a domain?' bits. Ugly as hell,
but not worse than before... At least we have unit tests to catch
regressions.
https://bugzilla.gnome.org/show_bug.cgi?id=681022
Diffstat (limited to 'embed/ephy-embed-private.h')
| -rw-r--r-- | embed/ephy-embed-private.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/embed/ephy-embed-private.h b/embed/ephy-embed-private.h index b23c5a3e0..0fcc5007a 100644 --- a/embed/ephy-embed-private.h +++ b/embed/ephy-embed-private.h @@ -33,17 +33,18 @@ G_BEGIN_DECLS /* EphyWebView */ #define EPHY_WEB_VIEW_NON_SEARCH_REGEX "(" \ - "^localhost(\\.[^[:space:]]+)?(:\\d+)?(/.*)?$|" \ - "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]$|" \ + "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9](:[0-9]+)?.*$|" \ "^::[0-9a-f:]*$|" \ "^[0-9a-f:]+:[0-9a-f:]*$|" \ - "^[^\\.[:space:]]+\\.[^\\.[:space:]]+.*$|" \ "^https?://[^/\\.[:space:]]+.*$|" \ "^about:.*$|" \ "^data:.*$|" \ "^file:.*$" \ ")" +#define EPHY_WEB_VIEW_DOMAIN_REGEX "^localhost(\\.[^[:space:]]+)?(:\\d+)?(:[0-9]+)?(/.*)?$|" \ + "^[^\\.[:space:]]+\\.[^\\.[:space:]]+.*$|" + void ephy_web_view_set_visit_type (EphyWebView *view, EphyHistoryPageVisitType visit_type); EphyHistoryPageVisitType ephy_web_view_get_visit_type (EphyWebView *view); |