Change site styles structure for a more generic one

diff --git a/config.def.h b/config.def.h
index dce76f8..712f975 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -90,7 +90,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
  * The iteration will stop at the first match, beginning at the beginning of
  * the list.
  */
-static SiteStyle styles[] = {
+static SiteSpecific styles[] = {
        /* regexp               file in $styledir */
        { ".*",                 "default.css" },
 };

diff --git a/surf.c b/surf.c
index 9f0c8a1..77e3d6f 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -136,9 +136,9 @@ typedef struct {
 
 typedef struct {
        char *regex;
-       char *style;
+       char *file;
        regex_t re;
-} SiteStyle;
+} SiteSpecific;
 
 /* Surf */
 static void usage(void);
@@ -304,8 +304,8 @@ setup(void)
                                        styles[i].regex);
                                styles[i].regex = NULL;
                        }
-                       styles[i].style = g_strconcat(styledir, "/",
-                                                     styles[i].style, NULL);
+                       styles[i].file = g_strconcat(styledir, "/",
+                                                    styles[i].file, NULL);
                }
                g_free(styledir);
        } else {
@@ -748,7 +748,7 @@ getstyle(const char *uri)
        for (i = 0; i < LENGTH(styles); ++i) {
                if (styles[i].regex &&
                    !regexec(&(styles[i].re), uri, 0, NULL, 0))
-                       return styles[i].style;
+                       return styles[i].file;
        }
 
        return "";