Merge lp:~kalikiana/midori/subdomains into lp:midori

[Cris Dywan]

Add Midori.URI.get_base_domain and use it in NoJS

[André Stösel (ivaldi)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-08 22:22:34 +0000
+++ CMakeLists.txt	2013-09-16 23:23:07 +0000
@@ -106,6 +106,7 @@
 endif ()
 if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.40.0")
     add_definitions("-DHAVE_LIBSOUP_2_40_0")
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0)
 endif ()
 
 if (WIN32)
 
=== modified file 'extensions/nojs/nojs.c'
--- extensions/nojs/nojs.c	2013-09-09 09:53:44 +0000
+++ extensions/nojs/nojs.c	2013-09-16 23:23:07 +0000
@@ -873,38 +873,15 @@
 
 	NoJSPrivate			*priv=self->priv;
 	const gchar			*realDomain;
-	gchar				*asciiDomain, *domain;
 	gchar				*finalDomain;
 
 	/* Get domain of site to lookup */
 	realDomain=soup_uri_get_host(inURI);
 
-	domain=asciiDomain=g_hostname_to_ascii(realDomain);
-
 	if(priv->checkOnlySecondLevel)
-	{
-		/* Only get second level domain if host is not an IP address */
-		if(!g_hostname_is_ip_address(asciiDomain))
-		{
-			gint		numberDots=0;
-
-			domain=asciiDomain+strlen(asciiDomain)-1;
-			while(domain>=asciiDomain && numberDots<2)
-			{
-				if(*domain=='.') numberDots++;
-				domain--;
-			}
-			domain++;
-			if(*domain=='.') domain++;
-		}
-	}
-
-	/* Create copy for return value */
-	if(strlen(domain)>0) finalDomain=g_strdup(domain);
-		else finalDomain=NULL;
-
-	/* Free allocated resources */
-	g_free(asciiDomain);
+		finalDomain=midori_uri_get_base_domain(realDomain);
+    else
+		finalDomain=midori_uri_to_ascii(realDomain);
 
 	/* Return domain */
 	return(finalDomain);
 
=== modified file 'katze/midori-uri.vala'
--- katze/midori-uri.vala	2013-08-06 21:52:12 +0000
+++ katze/midori-uri.vala	2013-09-16 23:23:07 +0000
@@ -52,6 +52,17 @@
             }
             return uri;
         }
+        public static string get_base_domain (string uri) {
+            string ascii = to_ascii (uri);
+#if HAVE_LIBSOUP_2_40_0
+            try {
+                return Soup.tld_get_base_domain (ascii);
+            } catch (Error error) {
+                /* This is fine, we fallback to hostname */
+            }
+#endif
+            return parse_hostname (uri, null);
+        }
         public static string unescape (string uri) {
             /* Unescape, pass through + and %20 */
             if (uri.chr (-1, '%') != null || uri.chr (-1, ' ') != null) {
 
=== modified file 'tests/magic-uri.c'
--- tests/magic-uri.c	2013-05-27 00:32:12 +0000
+++ tests/magic-uri.c	2013-09-16 23:23:07 +0000
@@ -420,6 +420,16 @@
     g_assert (sokoke_external_uri ("httparty:woo") == uri_has_default ("httparty:woo"));
 }
 
+static void
+magic_uri_base_domain (void)
+{
+    #ifdef HAVE_LIBSOUP_2_40_0
+    g_assert_cmpstr ("bbc.co.uk", ==, midori_uri_get_base_domain ("http://www.bbc.co.uk"));
+    g_assert_cmpstr ("zeit.de", ==, midori_uri_get_base_domain ("http://www.zeit.de"));
+    #endif
+    g_assert_cmpstr ("123.456.789.100", ==, midori_uri_get_base_domain ("http://123.456.789.100"));
+}
+
 int
 main (int    argc,
       char** argv)
@@ -439,6 +449,7 @@
     g_test_add_func ("/magic-uri/prefetch", magic_uri_prefetch);
     g_test_add_func ("/magic-uri/commands", magic_uri_commands);
     g_test_add_func ("/magic-uri/protocols", magic_uri_protocols);
+    g_test_add_func ("/magic-uri/base-domain", magic_uri_base_domain);
 
     return g_test_run ();
 }