Changeset 11801

Timestamp:

Feb 1, 2011, 1:38:58 AM (12 years ago)

Author:

jordan

Message:

(trunk gtk) #3971 "favicons do not work for IP addresses" -- fixed.

gtr_get_host_from_url() wasn't written to handle dotted-quad or IPv6 address strings, but can handle them now.

Location:

trunk/gtk

Files:

• filter.c (modified) (1 diff)
• util.c (modified) (1 diff)

trunk/gtk/filter.c

@@ -71 +71 @@
     const char * dot = strrchr( host, '.' );
 
-    if( dot == NULL )
+    if( tr_addressIsIP( host ) )
         name = g_strdup( host );
+    else if( dot )
+        name = g_strndup( host, dot - host );
     else
-        name = g_strndup( host, dot - host );
+        name = g_strdup( host );
 
     *name = g_ascii_toupper( *name );

trunk/gtk/util.c

@@ -254 +254 @@
     char * h = NULL;
     char * name;
-    const char * first_dot;
-    const char * last_dot;
 
     tr_urlParse( url, -1, NULL, &h, NULL, NULL );
-    first_dot = strchr( h, '.' );
-    last_dot = strrchr( h, '.' );
-
-    if( ( first_dot ) && ( last_dot ) && ( first_dot != last_dot ) )
-        name = g_strdup( first_dot + 1 );
-    else
+
+    if( tr_addressIsIP( h ) )
         name = g_strdup( h );
+    else {
+        const char * first_dot = strchr( h, '.' );
+        const char * last_dot = strrchr( h, '.' );
+        if( ( first_dot ) && ( last_dot ) && ( first_dot != last_dot ) )
+            name = g_strdup( first_dot + 1 );
+        else
+            name = g_strdup( h );
+    }
 
     tr_free( h );