we_adblock: No need for static here, either

[chorizo.git] / we_adblock.c

diff --git a/we_adblock.c b/we_adblock.c
index be4e7b775456a40e754ab588e2964b5ed8708bba..79dd691208c2360de030b7041dfd7f8845939ac1 100644 (file)
--- a/we_adblock.c
+++ b/we_adblock.c
@@ -4,78 +4,78 @@
 #include <webkit2/webkit-web-extension.h>
 
 
-static GSList *adblock_patterns = NULL;
+GSList *adblock_patterns = NULL;
 
 
-static void
+void
 adblock_load(void)
 {
-       GRegex *re = NULL;
-       GError *err = NULL;
-       GIOChannel *channel = NULL;
-       gchar *path = NULL, *buf = NULL;
+    GRegex *re = NULL;
+    GError *err = NULL;
+    GIOChannel *channel = NULL;
+    gchar *path = NULL, *buf = NULL;
 
-       path = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock.black",
-                               NULL);
-       channel = g_io_channel_new_file(path, "r", &err);
-       if (channel != NULL)
-       {
-               while (g_io_channel_read_line(channel, &buf, NULL, NULL, NULL)
-                      == G_IO_STATUS_NORMAL)
-               {
-                       g_strstrip(buf);
-                       if (buf[0] != '#')
-                       {
-                               re = g_regex_new(buf,
-                                                G_REGEX_CASELESS | G_REGEX_OPTIMIZE,
-                                                G_REGEX_MATCH_PARTIAL, &err);
-                               if (err != NULL)
-                               {
-                                       fprintf(stderr, __NAME__": Could not compile regex: %s\n", buf);
-                                       g_error_free(err);
-                                       err = NULL;
-                               }
-                               else
-                                       adblock_patterns = g_slist_append(adblock_patterns, re);
-                       }
-                       g_free(buf);
-               }
-               g_io_channel_shutdown(channel, FALSE, NULL);
-       }
-       g_free(path);
+    path = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock.black",
+                            NULL);
+    channel = g_io_channel_new_file(path, "r", &err);
+    if (channel != NULL)
+    {
+        while (g_io_channel_read_line(channel, &buf, NULL, NULL, NULL)
+               == G_IO_STATUS_NORMAL)
+        {
+            g_strstrip(buf);
+            if (buf[0] != '#')
+            {
+                re = g_regex_new(buf,
+                                 G_REGEX_CASELESS | G_REGEX_OPTIMIZE,
+                                 G_REGEX_MATCH_PARTIAL, &err);
+                if (err != NULL)
+                {
+                    fprintf(stderr, __NAME__": Could not compile regex: %s\n", buf);
+                    g_error_free(err);
+                    err = NULL;
+                }
+                else
+                    adblock_patterns = g_slist_append(adblock_patterns, re);
+            }
+            g_free(buf);
+        }
+        g_io_channel_shutdown(channel, FALSE, NULL);
+    }
+    g_free(path);
 }
 
-static gboolean
+gboolean
 web_page_send_request(WebKitWebPage *web_page, WebKitURIRequest *request,
                       WebKitURIResponse *redirected_response, gpointer user_data)
 {
-       GSList *it = adblock_patterns;
-       const gchar *uri;
+    GSList *it = adblock_patterns;
+    const gchar *uri;
 
-       uri = webkit_uri_request_get_uri(request);
+    uri = webkit_uri_request_get_uri(request);
 
-       while (it)
-       {
-               if (g_regex_match((GRegex *)(it->data), uri, 0, NULL))
-                       return TRUE;
-               it = g_slist_next(it);
-       }
+    while (it)
+    {
+        if (g_regex_match((GRegex *)(it->data), uri, 0, NULL))
+            return TRUE;
+        it = g_slist_next(it);
+    }
 
-       return FALSE;
+    return FALSE;
 }
 
-static void
+void
 web_page_created_callback(WebKitWebExtension *extension, WebKitWebPage *web_page,
                           gpointer user_data)
 {
-       g_signal_connect_object(web_page, "send-request",
-                               G_CALLBACK(web_page_send_request), NULL, 0);
+    g_signal_connect_object(web_page, "send-request",
+                            G_CALLBACK(web_page_send_request), NULL, 0);
 }
 
 G_MODULE_EXPORT void
 webkit_web_extension_initialize(WebKitWebExtension *extension)
 {
-       adblock_load();
-       g_signal_connect(extension, "page-created",
-                        G_CALLBACK(web_page_created_callback), NULL);
+    adblock_load();
+    g_signal_connect(extension, "page-created",
+                     G_CALLBACK(web_page_created_callback), NULL);
 }