[Xfce4-commits] <midori:master> Fix length calculation and typos in fixup function

[Christian Dywan]

Updating branch refs/heads/master
         to 4d7424adc45e8a2e5fcd66601c158fc39c71b59b (commit)
       from 60cb44c8469ab9e4204ef22c05389705ecddc4dd (commit)

commit 4d7424adc45e8a2e5fcd66601c158fc39c71b59b
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Thu Jun 23 15:28:06 2011 -0400

    Fix length calculation and typos in fixup function

 extensions/adblock.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 5435152..8ec30fc 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -1021,39 +1021,35 @@ adblock_fixup_regexp (const gchar* prefix,
         {
         case '*':
             g_string_append (str, ".*");
+            len += 2;
             break;
         /*case '.':
             g_string_append (str, "\\.");
             break;*/
         case '?':
             g_string_append (str, "\\?");
+            len += 2;
             break;
         case '|':
-            g_string_append (str, "");
-            break;
         /* FIXME: We actually need to match :[0-9]+ or '/'. Sign means
            "here could be port number or nothing". So bla.com^ will match
            bla.com/ or bla.com:8080/ but not bla.com.au/ */
         case '^':
-            g_string_append (str, "");
-            break;
         case '+':
             break;
         default:
             g_string_append_printf (str,"%c", *src);
+            len++;
             break;
         }
         src++;
-        len++;
     }
     while (*src);
 
     dst = g_string_free (str, FALSE);
     /* We dont need .* in the end of url. Thats stupid */
     if (dst && dst[len-1] == '*' && dst[len-2] == '.')
-    {
         dst[len-2] = '\0';
-    }
     return dst;
 }