summaryrefslogtreecommitdiff
path: root/embed/web-extension
diff options
context:
space:
mode:
Diffstat (limited to 'embed/web-extension')
-rw-r--r--embed/web-extension/ephy-embed-form-auth.c7
-rw-r--r--embed/web-extension/ephy-uri-tester.c649
-rw-r--r--embed/web-extension/ephy-web-dom-utils.c38
-rw-r--r--embed/web-extension/ephy-web-extension-main.c2
-rw-r--r--embed/web-extension/ephy-web-extension.c142
-rw-r--r--embed/web-extension/ephy-web-overview-model.c22
-rw-r--r--embed/web-extension/ephy-web-overview.c63
7 files changed, 432 insertions, 491 deletions
diff --git a/embed/web-extension/ephy-embed-form-auth.c b/embed/web-extension/ephy-embed-form-auth.c
index 1ce650490..054277953 100644
--- a/embed/web-extension/ephy-embed-form-auth.c
+++ b/embed/web-extension/ephy-embed-form-auth.c
@@ -19,8 +19,7 @@
#include <config.h>
#include "ephy-embed-form-auth.h"
-struct _EphyEmbedFormAuth
-{
+struct _EphyEmbedFormAuth {
GObject parent_instance;
guint64 page_id;
@@ -62,7 +61,7 @@ EphyEmbedFormAuth *
ephy_embed_form_auth_new (WebKitWebPage *web_page,
WebKitDOMNode *username_node,
WebKitDOMNode *password_node,
- const char* username)
+ const char *username)
{
EphyEmbedFormAuth *form_auth;
@@ -103,7 +102,7 @@ ephy_embed_form_auth_get_page_id (EphyEmbedFormAuth *form_auth)
return form_auth->page_id;
}
-const char*
+const char *
ephy_embed_form_auth_get_username (EphyEmbedFormAuth *form_auth)
{
return form_auth->username;
diff --git a/embed/web-extension/ephy-uri-tester.c b/embed/web-extension/ephy-uri-tester.c
index 76cdc3b29..c2c97ab0c 100644
--- a/embed/web-extension/ephy-uri-tester.c
+++ b/embed/web-extension/ephy-uri-tester.c
@@ -35,8 +35,7 @@
#define SIGNATURE_SIZE 8
#define UPDATE_FREQUENCY 24 * 60 * 60 /* In seconds */
-struct _EphyUriTester
-{
+struct _EphyUriTester {
GObject parent_instance;
GSList *filters;
@@ -61,8 +60,7 @@ struct _EphyUriTester
GRegex *regex_frame_add;
};
-enum
-{
+enum {
PROP_0,
PROP_FILTERS,
PROP_BASE_DATA_DIR,
@@ -93,9 +91,9 @@ ephy_uri_tester_ensure_data_dir (const char *base_data_dir)
return folder;
}
-static char*
+static char *
ephy_uri_tester_get_fileuri_for_url (EphyUriTester *tester,
- const char *url)
+ const char *url)
{
char *filename = NULL;
char *path = NULL;
@@ -121,8 +119,8 @@ typedef struct {
} RetrieveFilterAsyncData;
static void
-ephy_uri_tester_retrieve_filter_finished (GFile *src,
- GAsyncResult *result,
+ephy_uri_tester_retrieve_filter_finished (GFile *src,
+ GAsyncResult *result,
RetrieveFilterAsyncData *data)
{
GError *error = NULL;
@@ -140,8 +138,8 @@ ephy_uri_tester_retrieve_filter_finished (GFile *src,
static void
ephy_uri_tester_retrieve_filter (EphyUriTester *tester,
- const char *url,
- const char *fileuri)
+ const char *url,
+ const char *fileuri)
{
GFile *src;
GFile *dest;
@@ -184,21 +182,19 @@ ephy_uri_tester_filter_is_valid (const char *fileuri)
NULL,
NULL);
result = FALSE;
- if (file_info)
- {
- GTimeVal current_time;
- GTimeVal mod_time;
-
- g_get_current_time (&current_time);
- g_file_info_get_modification_time (file_info, &mod_time);
-
- if (current_time.tv_sec > mod_time.tv_sec)
- {
- gint64 expire_time = mod_time.tv_sec + UPDATE_FREQUENCY;
- result = current_time.tv_sec < expire_time;
- }
- g_object_unref (file_info);
+ if (file_info) {
+ GTimeVal current_time;
+ GTimeVal mod_time;
+
+ g_get_current_time (&current_time);
+ g_file_info_get_modification_time (file_info, &mod_time);
+
+ if (current_time.tv_sec > mod_time.tv_sec) {
+ gint64 expire_time = mod_time.tv_sec + UPDATE_FREQUENCY;
+ result = current_time.tv_sec < expire_time;
}
+ g_object_unref (file_info);
+ }
g_object_unref (file);
@@ -213,18 +209,17 @@ ephy_uri_tester_load_patterns (EphyUriTester *tester)
char *fileuri = NULL;
/* Load patterns from the list of filters. */
- for (filter = tester->filters; filter; filter = g_slist_next(filter))
- {
- url = (char*)filter->data;
- fileuri = ephy_uri_tester_get_fileuri_for_url (tester, url);
+ for (filter = tester->filters; filter; filter = g_slist_next (filter)) {
+ url = (char *)filter->data;
+ fileuri = ephy_uri_tester_get_fileuri_for_url (tester, url);
- if (!ephy_uri_tester_filter_is_valid (fileuri))
- ephy_uri_tester_retrieve_filter (tester, url, fileuri);
- else
- ephy_uri_tester_parse_file_at_uri (tester, fileuri);
+ if (!ephy_uri_tester_filter_is_valid (fileuri))
+ ephy_uri_tester_retrieve_filter (tester, url, fileuri);
+ else
+ ephy_uri_tester_parse_file_at_uri (tester, fileuri);
- g_free (fileuri);
- }
+ g_free (fileuri);
+ }
}
static void
@@ -235,53 +230,47 @@ ephy_uri_tester_load_filters (EphyUriTester *tester)
filepath = g_build_filename (tester->data_dir, FILTERS_LIST_FILENAME, NULL);
- if (g_file_test (filepath, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
- {
- GFile *file = NULL;
- char *contents = NULL;
- gsize length = 0;
- GError *error = NULL;
-
- file = g_file_new_for_path (filepath);
- if (g_file_load_contents (file, NULL, &contents, &length, NULL, &error))
- {
- char **urls_array = NULL;
- char *url = NULL;
- int i = 0;
-
- urls_array = g_strsplit (contents, ";", -1);
- for (i = 0; urls_array [i]; i++)
- {
- url = g_strstrip (g_strdup (urls_array[i]));
- if (!g_str_equal (url, ""))
- list = g_slist_prepend (list, url);
- }
- g_strfreev (urls_array);
-
- g_free (contents);
- }
-
- if (error)
- {
- LOG ("Error loading filters from %s: %s", filepath, error->message);
- g_error_free (error);
- }
+ if (g_file_test (filepath, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
+ GFile *file = NULL;
+ char *contents = NULL;
+ gsize length = 0;
+ GError *error = NULL;
+
+ file = g_file_new_for_path (filepath);
+ if (g_file_load_contents (file, NULL, &contents, &length, NULL, &error)) {
+ char **urls_array = NULL;
+ char *url = NULL;
+ int i = 0;
+
+ urls_array = g_strsplit (contents, ";", -1);
+ for (i = 0; urls_array [i]; i++) {
+ url = g_strstrip (g_strdup (urls_array[i]));
+ if (!g_str_equal (url, ""))
+ list = g_slist_prepend (list, url);
+ }
+ g_strfreev (urls_array);
- g_object_unref (file);
+ g_free (contents);
}
- else
- {
- /* No file exists yet, so use the default filter and save it. */
- list = g_slist_prepend (list, g_strdup (DEFAULT_FILTER_URL));
+
+ if (error) {
+ LOG ("Error loading filters from %s: %s", filepath, error->message);
+ g_error_free (error);
}
+ g_object_unref (file);
+ } else {
+ /* No file exists yet, so use the default filter and save it. */
+ list = g_slist_prepend (list, g_strdup (DEFAULT_FILTER_URL));
+ }
+
g_free (filepath);
- ephy_uri_tester_set_filters (tester, g_slist_reverse(list));
+ ephy_uri_tester_set_filters (tester, g_slist_reverse (list));
}
#if 0
-TODO: Use this to create a filters dialog, or something.
+ TODO: Use this to create a filters dialog, or something.
static void
ephy_uri_tester_save_filters (EphyUriTester *tester)
@@ -291,30 +280,28 @@ ephy_uri_tester_save_filters (EphyUriTester *tester)
filepath = g_build_filename (tester->data_dir, FILTERS_LIST_FILENAME, NULL);
- if ((file = g_fopen (filepath, "w")))
- {
- GSList *item = NULL;
- char *filter = NULL;
+ if ((file = g_fopen (filepath, "w"))) {
+ GSList *item = NULL;
+ char *filter = NULL;
- for (item = tester->filters; item; item = g_slist_next (item))
- {
- filter = g_strdup_printf ("%s;", (char*)item->data);
- fputs (filter, file);
- g_free (filter);
- }
- fclose (file);
+ for (item = tester->filters; item; item = g_slist_next (item)) {
+ filter = g_strdup_printf ("%s;", (char *)item->data);
+ fputs (filter, file);
+ g_free (filter);
}
+ fclose (file);
+ }
g_free (filepath);
}
#endif
static inline int
-ephy_uri_tester_check_rule (EphyUriTester *tester,
- GRegex *regex,
- const char *patt,
- const char *req_uri,
- const char *page_uri,
- gboolean whitelist)
+ephy_uri_tester_check_rule (EphyUriTester *tester,
+ GRegex *regex,
+ const char *patt,
+ const char *req_uri,
+ const char *page_uri,
+ gboolean whitelist)
{
char *opts;
GHashTable *optslist = tester->optslist;
@@ -325,11 +312,10 @@ ephy_uri_tester_check_rule (EphyUriTester *tester,
return FALSE;
opts = g_hash_table_lookup (optslist, patt);
- if (opts && g_regex_match (tester->regex_third_party, opts, 0, NULL))
- {
- if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL))
- return FALSE;
- }
+ if (opts && g_regex_match (tester->regex_third_party, opts, 0, NULL)) {
+ if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL))
+ return FALSE;
+ }
/* TODO: Domain and document opt check */
if (whitelist)
LOG ("whitelisted by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri);
@@ -339,10 +325,10 @@ ephy_uri_tester_check_rule (EphyUriTester *tester,
}
static inline gboolean
-ephy_uri_tester_is_matched_by_pattern (EphyUriTester *tester,
- const char *req_uri,
- const char *page_uri,
- gboolean whitelist)
+ephy_uri_tester_is_matched_by_pattern (EphyUriTester *tester,
+ const char *req_uri,
+ const char *page_uri,
+ gboolean whitelist)
{
GHashTableIter iter;
gpointer patt, regex;
@@ -351,20 +337,19 @@ ephy_uri_tester_is_matched_by_pattern (EphyUriTester *tester,
pattern = tester->whitelisted_pattern;
g_hash_table_iter_init (&iter, pattern);
- while (g_hash_table_iter_next (&iter, &patt, &regex))
- {
- if (ephy_uri_tester_check_rule (tester, regex, patt, req_uri, page_uri, whitelist))
- return TRUE;
- }
+ while (g_hash_table_iter_next (&iter, &patt, &regex)) {
+ if (ephy_uri_tester_check_rule (tester, regex, patt, req_uri, page_uri, whitelist))
+ return TRUE;
+ }
return FALSE;
}
static inline gboolean
-ephy_uri_tester_is_matched_by_key (EphyUriTester *tester,
- const char *opts,
- const char *req_uri,
- const char *page_uri,
- gboolean whitelist)
+ephy_uri_tester_is_matched_by_key (EphyUriTester *tester,
+ const char *opts,
+ const char *req_uri,
+ const char *page_uri,
+ gboolean whitelist)
{
char *uri;
int len;
@@ -379,35 +364,34 @@ ephy_uri_tester_is_matched_by_key (EphyUriTester *tester,
memset (&sig[0], 0, sizeof (sig));
/* Signatures are made on pattern, so we need to convert url to a pattern as well */
- guri = ephy_uri_tester_fixup_regexp ("", (char*)req_uri);
+ guri = ephy_uri_tester_fixup_regexp ("", (char *)req_uri);
uri = guri->str;
len = guri->len;
- for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--)
- {
- GRegex *regex;
- strncpy (sig, uri + pos, SIGNATURE_SIZE);
- regex = g_hash_table_lookup (keys, sig);
-
- /* Dont check if regex is already blacklisted */
- if (!regex || g_list_find (regex_bl, regex))
- continue;
- ret = ephy_uri_tester_check_rule (tester, regex, sig, req_uri, page_uri, whitelist);
- if (ret)
- break;
- regex_bl = g_list_prepend (regex_bl, regex);
- }
+ for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) {
+ GRegex *regex;
+ strncpy (sig, uri + pos, SIGNATURE_SIZE);
+ regex = g_hash_table_lookup (keys, sig);
+
+ /* Dont check if regex is already blacklisted */
+ if (!regex || g_list_find (regex_bl, regex))
+ continue;
+ ret = ephy_uri_tester_check_rule (tester, regex, sig, req_uri, page_uri, whitelist);
+ if (ret)
+ break;
+ regex_bl = g_list_prepend (regex_bl, regex);
+ }
g_string_free (guri, TRUE);
g_list_free (regex_bl);
return ret;
}
static gboolean
-ephy_uri_tester_is_matched (EphyUriTester *tester,
- const char *opts,
- const char *req_uri,
- const char *page_uri,
- gboolean whitelist)
+ephy_uri_tester_is_matched (EphyUriTester *tester,
+ const char *opts,
+ const char *req_uri,
+ const char *page_uri,
+ gboolean whitelist)
{
char *value;
GHashTable *urlcache = tester->urlcache;
@@ -419,18 +403,16 @@ ephy_uri_tester_is_matched (EphyUriTester *tester,
return GPOINTER_TO_INT (value);
/* Look for a match either by key or by pattern. */
- if (ephy_uri_tester_is_matched_by_key (tester, opts, req_uri, page_uri, whitelist))
- {
- g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup ("1"));
- return TRUE;
- }
+ if (ephy_uri_tester_is_matched_by_key (tester, opts, req_uri, page_uri, whitelist)) {
+ g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup ("1"));
+ return TRUE;
+ }
/* Matching by pattern is pretty expensive, so do it if needed only. */
- if (ephy_uri_tester_is_matched_by_pattern (tester, req_uri, page_uri, whitelist))
- {
- g_hash_table_insert (urlcache, g_strdup (req_uri), GINT_TO_POINTER (TRUE));
- return TRUE;
- }
+ if (ephy_uri_tester_is_matched_by_pattern (tester, req_uri, page_uri, whitelist)) {
+ g_hash_table_insert (urlcache, g_strdup (req_uri), GINT_TO_POINTER (TRUE));
+ return TRUE;
+ }
g_hash_table_insert (urlcache, g_strdup (req_uri), GINT_TO_POINTER (FALSE));
return FALSE;
@@ -448,54 +430,50 @@ ephy_uri_tester_fixup_regexp (const char *prefix, char *src)
str = g_string_new (prefix);
/* lets strip first .* */
- if (src[0] == '*')
- {
- (void)*src++;
- }
+ if (src[0] == '*') {
+ (void)*src++;
+ }
- do
- {
- switch (*src)
- {
- case '*':
- g_string_append (str, ".*");
- break;
- /*case '.':
- g_string_append (str, "\\.");
- break;*/
- case '?':
- case '[':
- case ']':
- g_string_append_printf (str, "\\%c", *src);
- break;
- case '|':
- /* 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 '^':
- case '+':
- break;
- default:
- g_string_append_printf (str,"%c", *src);
- break;
- }
- src++;
+ do {
+ switch (*src) {
+ case '*':
+ g_string_append (str, ".*");
+ break;
+ /*case '.':
+ g_string_append (str, "\\.");
+ break;*/
+ case '?':
+ case '[':
+ case ']':
+ g_string_append_printf (str, "\\%c", *src);
+ break;
+ case '|':
+ /* 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 '^':
+ case '+':
+ break;
+ default:
+ g_string_append_printf (str, "%c", *src);
+ break;
}
- while (*src);
+ src++;
+ } while (*src);
len = str->len;
/* We dont need .* in the end of url. Thats stupid */
- if (str->str && str->str[len-1] == '*' && str->str[len-2] == '.')
- g_string_erase (str, len-2, 2);
+ if (str->str && str->str[len - 1] == '*' && str->str[len - 2] == '.')
+ g_string_erase (str, len - 2, 2);
return str;
}
static void
ephy_uri_tester_compile_regexp (EphyUriTester *tester,
- GString *gpatt,
- const char *opts,
- gboolean whitelist)
+ GString *gpatt,
+ const char *opts,
+ gboolean whitelist)
{
GHashTable *pattern;
GHashTable *keys;
@@ -514,126 +492,110 @@ ephy_uri_tester_compile_regexp (EphyUriTester *tester,
/* TODO: Play with optimization flags */
regex = g_regex_new (patt, G_REGEX_OPTIMIZE | G_REGEX_JAVASCRIPT_COMPAT,
G_REGEX_MATCH_NOTEMPTY, &error);
- if (error)
- {
- g_warning ("%s: %s", G_STRFUNC, error->message);
- g_error_free (error);
- return;
- }
+ if (error) {
+ g_warning ("%s: %s", G_STRFUNC, error->message);
+ g_error_free (error);
+ return;
+ }
pattern = tester->pattern;
keys = tester->keys;
optslist = tester->optslist;
- if (whitelist)
- {
- pattern = tester->whitelisted_pattern;
- keys = tester->whitelisted_keys;
- optslist = tester->whitelisted_optslist;
- }
+ if (whitelist) {
+ pattern = tester->whitelisted_pattern;
+ keys = tester->whitelisted_keys;
+ optslist = tester->whitelisted_optslist;
+ }
- if (!g_regex_match (tester->regex_pattern, patt, 0, NULL))
- {
- int signature_count = 0;
- int pos = 0;
- char *sig;
-
- for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) {
- sig = g_strndup (patt + pos, SIGNATURE_SIZE);
- if (!strchr (sig, '*') &&
- !g_hash_table_lookup (keys, sig))
- {
- LOG ("sig: %s %s", sig, patt);
- g_hash_table_insert (keys, g_strdup (sig), g_regex_ref (regex));
- g_hash_table_insert (optslist, g_strdup (sig), g_strdup (opts));
- signature_count++;
- }
- else
- {
- if (sig[0] == '*' &&
- !g_hash_table_lookup (pattern, patt))
- {
- LOG ("patt2: %s %s", sig, patt);
- g_hash_table_insert (pattern, g_strdup (patt), g_regex_ref (regex));
- g_hash_table_insert (optslist, g_strdup (patt), g_strdup (opts));
- }
- }
- g_free (sig);
+ if (!g_regex_match (tester->regex_pattern, patt, 0, NULL)) {
+ int signature_count = 0;
+ int pos = 0;
+ char *sig;
+
+ for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) {
+ sig = g_strndup (patt + pos, SIGNATURE_SIZE);
+ if (!strchr (sig, '*') &&
+ !g_hash_table_lookup (keys, sig)) {
+ LOG ("sig: %s %s", sig, patt);
+ g_hash_table_insert (keys, g_strdup (sig), g_regex_ref (regex));
+ g_hash_table_insert (optslist, g_strdup (sig), g_strdup (opts));
+ signature_count++;
+ } else {
+ if (sig[0] == '*' &&
+ !g_hash_table_lookup (pattern, patt)) {
+ LOG ("patt2: %s %s", sig, patt);
+ g_hash_table_insert (pattern, g_strdup (patt), g_regex_ref (regex));
+ g_hash_table_insert (optslist, g_strdup (patt), g_strdup (opts));
+ }
}
- g_regex_unref (regex);
-
- if (signature_count > 1 && g_hash_table_lookup (pattern, patt))
- g_hash_table_remove (pattern, patt);
- }
- else
- {
- LOG ("patt: %s%s", patt, "");
- /* Pattern is a regexp chars */
- g_hash_table_insert (pattern, g_strdup (patt), regex);
- g_hash_table_insert (optslist, g_strdup (patt), g_strdup (opts));
+ g_free (sig);
}
+ g_regex_unref (regex);
+
+ if (signature_count > 1 && g_hash_table_lookup (pattern, patt))
+ g_hash_table_remove (pattern, patt);
+ } else {
+ LOG ("patt: %s%s", patt, "");
+ /* Pattern is a regexp chars */
+ g_hash_table_insert (pattern, g_strdup (patt), regex);
+ g_hash_table_insert (optslist, g_strdup (patt), g_strdup (opts));
+ }
}
static void
ephy_uri_tester_add_url_pattern (EphyUriTester *tester,
- const char *prefix,
- const char *type,
- char *line,
- gboolean whitelist)
+ const char *prefix,
+ const char *type,
+ char *line,
+ gboolean whitelist)
{
- char **data;
- char *patt;
- GString *format_patt;
- const char *opts;
-
- data = g_strsplit (line, "$", -1);
- if (!data || !data[0])
- {
- g_strfreev (data);
- return;
- }
-
- if (data[1] && data[2])
- {
- patt = g_strconcat (data[0], data[1], NULL);
- opts = g_strconcat (type, ",", data[2], NULL);
- }
- else if (data[1])
- {
- patt = data[0];
- opts = g_strconcat (type, ",", data[1], NULL);
- }
- else
- {
- patt = data[0];
- opts = type;
- }
-
- if (g_regex_match (tester->regex_subdocument, opts, 0, NULL))
- {
- if (data[1] && data[2])
- g_free (patt);
- if (data[1])
- g_free ((char *)opts);
- g_strfreev (data);
- return;
- }
-
- format_patt = ephy_uri_tester_fixup_regexp (prefix, patt);
+ char **data;
+ char *patt;
+ GString *format_patt;
+ const char *opts;
- if (whitelist)
- LOG ("whitelist: %s opts %s", format_patt->str, opts);
- else
- LOG ("blacklist: %s opts %s", format_patt->str, opts);
+ data = g_strsplit (line, "$", -1);
+ if (!data || !data[0]) {
+ g_strfreev (data);
+ return;
+ }
- ephy_uri_tester_compile_regexp (tester, format_patt, opts, whitelist);
+ if (data[1] && data[2]) {
+ patt = g_strconcat (data[0], data[1], NULL);
+ opts = g_strconcat (type, ",", data[2], NULL);
+ } else if (data[1]) {
+ patt = data[0];
+ opts = g_strconcat (type, ",", data[1], NULL);
+ } else {
+ patt = data[0];
+ opts = type;
+ }
+ if (g_regex_match (tester->regex_subdocument, opts, 0, NULL)) {
if (data[1] && data[2])
- g_free (patt);
+ g_free (patt);
if (data[1])
- g_free ((char *)opts);
+ g_free ((char *)opts);
g_strfreev (data);
+ return;
+ }
+
+ format_patt = ephy_uri_tester_fixup_regexp (prefix, patt);
- g_string_free (format_patt, TRUE);
+ if (whitelist)
+ LOG ("whitelist: %s opts %s", format_patt->str, opts);
+ else
+ LOG ("blacklist: %s opts %s", format_patt->str, opts);
+
+ ephy_uri_tester_compile_regexp (tester, format_patt, opts, whitelist);
+
+ if (data[1] && data[2])
+ g_free (patt);
+ if (data[1])
+ g_free ((char *)opts);
+ g_strfreev (data);
+
+ g_string_free (format_patt, TRUE);
}
static inline void
@@ -645,49 +607,43 @@ ephy_uri_tester_frame_add (EphyUriTester *tester, char *line)
(void)*line++;
if (strchr (line, '\'')
|| (strchr (line, ':')
- && !g_regex_match (tester->regex_frame_add, line, 0, NULL)))
- {
- return;
- }
+ && !g_regex_match (tester->regex_frame_add, line, 0, NULL))) {
+ return;
+ }
g_string_append (tester->blockcss, separator);
g_string_append (tester->blockcss, line);
}
static inline void
-ephy_uri_tester_frame_add_private (EphyUriTester *tester,
- const char *line,
- const char *sep)
+ephy_uri_tester_frame_add_private (EphyUriTester *tester,
+ const char *line,
+ const char *sep)
{
char **data;
data = g_strsplit (line, sep, 2);
if (!(data[1] && *data[1])
- || strchr (data[1], '\'')
+ || strchr (data[1], '\'')
|| (strchr (data[1], ':')
- && !g_regex_match (tester->regex_frame_add, data[1], 0, NULL)))
- {
- g_strfreev (data);
- return;
- }
+ && !g_regex_match (tester->regex_frame_add, data[1], 0, NULL))) {
+ g_strfreev (data);
+ return;
+ }
- if (strchr (data[0], ','))
- {
- char **domains;
- int i;
+ if (strchr (data[0], ',')) {
+ char **domains;
+ int i;
- domains = g_strsplit (data[0], ",", -1);
- for (i = 0; domains[i]; i++)
- {
- g_string_append_printf (tester->blockcssprivate, ";sites['%s']+=',%s'",
- g_strstrip (domains[i]), data[1]);
- }
- g_strfreev (domains);
- }
- else
- {
+ domains = g_strsplit (data[0], ",", -1);
+ for (i = 0; domains[i]; i++) {
g_string_append_printf (tester->blockcssprivate, ";sites['%s']+=',%s'",
- data[0], data[1]);
+ g_strstrip (domains[i]), data[1]);
}
+ g_strfreev (domains);
+ } else {
+ g_string_append_printf (tester->blockcssprivate, ";sites['%s']+=',%s'",
+ data[0], data[1]);
+ }
g_strfreev (data);
}
@@ -708,11 +664,10 @@ ephy_uri_tester_parse_line (EphyUriTester *tester,
return;
/* Whitelisted exception rules */
- if (g_str_has_prefix (line, "@@"))
- {
- ephy_uri_tester_parse_line (tester, line+2, TRUE);
- return;
- }
+ if (g_str_has_prefix (line, "@@")) {
+ ephy_uri_tester_parse_line (tester, line + 2, TRUE);
+ return;
+ }
/* FIXME: No support for domain= */
if (strstr (line, "domain="))
@@ -723,45 +678,40 @@ ephy_uri_tester_parse_line (EphyUriTester *tester,
return;
/* Got CSS block hider */
- if (line[0] == '#' && line[1] == '#' )
- {
- ephy_uri_tester_frame_add (tester, line);
- return;
- }
+ if (line[0] == '#' && line[1] == '#') {
+ ephy_uri_tester_frame_add (tester, line);
+ return;
+ }
/* Got CSS block hider. Workaround */
if (line[0] == '#')
return;
/* Got per domain CSS hider rule */
- if (strstr (line, "##"))
- {
- ephy_uri_tester_frame_add_private (tester, line, "##");
- return;
- }
+ if (strstr (line, "##")) {
+ ephy_uri_tester_frame_add_private (tester, line, "##");
+ return;
+ }
/* Got per domain CSS hider rule. Workaround */
- if (strchr (line, '#'))
- {
- ephy_uri_tester_frame_add_private (tester, line, "#");
- return;
- }
+ if (strchr (line, '#')) {
+ ephy_uri_tester_frame_add_private (tester, line, "#");
+ return;
+ }
/* Got URL blocker rule */
- if (line[0] == '|' && line[1] == '|' )
- {
- (void)*line++;
- (void)*line++;
- /* set a regex prefix to ensure that '||' patterns are anchored at the
- * start and that any characters (if any) preceding the domain specified
- * by the rule is separated from it by a dot '.' */
- ephy_uri_tester_add_url_pattern (tester, "^[\\w\\-]+:\\/+(?!\\/)(?:[^\\/]+\\.)?", "fulluri", line, whitelist);
- return;
- }
- if (line[0] == '|')
- {
- (void)*line++;
- ephy_uri_tester_add_url_pattern (tester, "^", "fulluri", line, whitelist);
- return;
- }
+ if (line[0] == '|' && line[1] == '|') {
+ (void)*line++;
+ (void)*line++;
+ /* set a regex prefix to ensure that '||' patterns are anchored at the
+ * start and that any characters (if any) preceding the domain specified
+ * by the rule is separated from it by a dot '.' */
+ ephy_uri_tester_add_url_pattern (tester, "^[\\w\\-]+:\\/+(?!\\/)(?:[^\\/]+\\.)?", "fulluri", line, whitelist);
+ return;
+ }
+ if (line[0] == '|') {
+ (void)*line++;
+ ephy_uri_tester_add_url_pattern (tester, "^", "fulluri", line, whitelist);
+ return;
+ }
ephy_uri_tester_add_url_pattern (tester, "", "uri", line, whitelist);
}
@@ -890,17 +840,16 @@ ephy_uri_tester_constructed (GObject *object)
}
static void
-ephy_uri_tester_set_property (GObject *object,
- guint prop_id,
+ephy_uri_tester_set_property (GObject *object,
+ guint prop_id,
const GValue *value,
- GParamSpec *pspec)
+ GParamSpec *pspec)
{
EphyUriTester *tester = EPHY_URI_TESTER (object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_FILTERS:
- ephy_uri_tester_set_filters (tester, (GSList*) g_value_get_pointer (value));
+ ephy_uri_tester_set_filters (tester, (GSList *)g_value_get_pointer (value));
break;
case PROP_BASE_DATA_DIR:
tester->data_dir = ephy_uri_tester_ensure_data_dir (g_value_get_string (value));
@@ -908,7 +857,7 @@ ephy_uri_tester_set_property (GObject *object,
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
- }
+ }
}
static void
@@ -955,7 +904,7 @@ ephy_uri_tester_class_init (EphyUriTesterClass *klass)
g_param_spec_pointer ("filters",
"filters",
"filters",
- G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS );
+ G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS);
obj_properties[PROP_BASE_DATA_DIR] =
g_param_spec_string ("base-data-dir",
@@ -977,8 +926,8 @@ ephy_uri_tester_new (const char *base_data_dir)
gboolean
ephy_uri_tester_test_uri (EphyUriTester *tester,
- const char *req_uri,
- const char *page_uri)
+ const char *req_uri,
+ const char *page_uri)
{
/* check whitelisting rules before the normal ones */
if (ephy_uri_tester_is_matched (tester, NULL, req_uri, page_uri, TRUE))
diff --git a/embed/web-extension/ephy-web-dom-utils.c b/embed/web-extension/ephy-web-dom-utils.c
index 6ffb86b11..cf327866a 100644
--- a/embed/web-extension/ephy-web-dom-utils.c
+++ b/embed/web-extension/ephy-web-dom-utils.c
@@ -159,8 +159,8 @@ resolve_uri (const char *base_uri,
static gboolean
get_icon_from_mstile (WebKitDOMDocument *document,
- char **uri_out,
- char **color_out)
+ char **uri_out,
+ char **color_out)
{
gboolean ret;
WebKitDOMNodeList *metas;
@@ -203,8 +203,8 @@ get_icon_from_mstile (WebKitDOMDocument *document,
static gboolean
get_icon_from_ogp (WebKitDOMDocument *document,
- char **uri_out,
- char **color_out)
+ char **uri_out,
+ char **color_out)
{
gboolean ret;
WebKitDOMNodeList *metas;
@@ -242,8 +242,8 @@ get_icon_from_ogp (WebKitDOMDocument *document,
static gboolean
get_icon_from_touch_icon (WebKitDOMDocument *document,
- char **uri_out,
- char **color_out)
+ char **uri_out,
+ char **color_out)
{
gboolean ret;
WebKitDOMNodeList *links;
@@ -279,8 +279,8 @@ get_icon_from_touch_icon (WebKitDOMDocument *document,
static gboolean
get_icon_from_favicon (WebKitDOMDocument *document,
- char **uri_out,
- char **color_out)
+ char **uri_out,
+ char **color_out)
{
gboolean ret;
WebKitDOMNodeList *links;
@@ -344,11 +344,11 @@ ephy_web_dom_utils_get_best_icon (WebKitDOMDocument *document,
* http://stackoverflow.com/questions/21991044/how-to-get-high-resolution-website-logo-favicon-for-a-given-url
*/
ret = get_icon_from_mstile (document, &image, &color);
- if (! ret)
+ if (!ret)
ret = get_icon_from_ogp (document, &image, &color);
- if (! ret)
+ if (!ret)
ret = get_icon_from_touch_icon (document, &image, &color);
- if (! ret)
+ if (!ret)
ret = get_icon_from_favicon (document, &image, &color);
if (uri_out != NULL)
@@ -364,8 +364,8 @@ ephy_web_dom_utils_get_best_icon (WebKitDOMDocument *document,
gboolean
ephy_web_dom_utils_find_form_auth_elements (WebKitDOMHTMLFormElement *form,
- WebKitDOMNode **username,
- WebKitDOMNode **password)
+ WebKitDOMNode **username,
+ WebKitDOMNode **password)
{
WebKitDOMHTMLCollection *elements;
WebKitDOMNode *username_node = NULL;
@@ -421,7 +421,7 @@ ephy_web_dom_utils_find_form_auth_elements (WebKitDOMHTMLFormElement *form,
g_free (element_name);
}
- g_object_unref(elements);
+ g_object_unref (elements);
if (found_auth_no_username_elements && password_node) {
g_clear_object (&username_node);
@@ -457,8 +457,8 @@ ephy_web_dom_utils_find_form_auth_elements (WebKitDOMHTMLFormElement *form,
**/
void
ephy_web_dom_utils_get_absolute_position_for_element (WebKitDOMElement *element,
- double *x,
- double *y)
+ double *x,
+ double *y)
{
WebKitDOMElement *parent;
double offset_top, offset_left;
@@ -492,8 +492,8 @@ ephy_web_dom_utils_get_absolute_position_for_element (WebKitDOMElement *element,
**/
void
ephy_web_dom_utils_get_absolute_bottom_for_element (WebKitDOMElement *element,
- double *x,
- double *y)
+ double *x,
+ double *y)
{
double offset_height;
@@ -513,7 +513,7 @@ ephy_web_dom_utils_get_absolute_bottom_for_element (WebKitDOMElement *element,
* Returns: a newly allocated string with the selection or %NULL.
**/
char *
-ephy_web_dom_utils_get_selection_as_string (WebKitDOMDOMSelection *selection)
+ephy_web_dom_utils_get_selection_as_string (WebKitDOMDOMSelection *selection)
{
char *string;
WebKitDOMRange *range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
diff --git a/embed/web-extension/ephy-web-extension-main.c b/embed/web-extension/ephy-web-extension-main.c
index 9c416a014..0dd24095d 100644
--- a/embed/web-extension/ephy-web-extension-main.c
+++ b/embed/web-extension/ephy-web-extension-main.c
@@ -30,7 +30,7 @@ static EphyWebExtension *extension = NULL;
G_MODULE_EXPORT void
webkit_web_extension_initialize_with_user_data (WebKitWebExtension *webkit_extension,
- GVariant *user_data)
+ GVariant *user_data)
{
const char *server_address;
const char *dot_dir;
diff --git a/embed/web-extension/ephy-web-extension.c b/embed/web-extension/ephy-web-extension.c
index d72245a2b..a0ec04d82 100644
--- a/embed/web-extension/ephy-web-extension.c
+++ b/embed/web-extension/ephy-web-extension.c
@@ -42,8 +42,7 @@
#include <webkitdom/WebKitDOMDOMWindowUnstable.h>
#include <JavaScriptCore/JavaScript.h>
-struct _EphyWebExtension
-{
+struct _EphyWebExtension {
GObject parent_instance;
WebKitWebExtension *extension;
@@ -108,10 +107,10 @@ static const char introspection_xml[] =
G_DEFINE_TYPE (EphyWebExtension, ephy_web_extension, G_TYPE_OBJECT)
static gboolean
-web_page_send_request (WebKitWebPage *web_page,
- WebKitURIRequest *request,
+web_page_send_request (WebKitWebPage *web_page,
+ WebKitURIRequest *request,
WebKitURIResponse *redirected_response,
- EphyWebExtension *extension)
+ EphyWebExtension *extension)
{
const char *request_uri;
const char *page_uri;
@@ -140,7 +139,7 @@ web_page_send_request (WebKitWebPage *web_page,
}
if (!g_settings_get_boolean (EPHY_SETTINGS_WEB, EPHY_PREFS_WEB_ENABLE_ADBLOCK))
- return FALSE;
+ return FALSE;
page_uri = webkit_web_page_get_uri (web_page);
@@ -150,7 +149,7 @@ web_page_send_request (WebKitWebPage *web_page,
/* Always load data requests, as uri_tester won't do any good here. */
if (g_str_has_prefix (request_uri, SOUP_URI_SCHEME_DATA))
- return FALSE;
+ return FALSE;
ret = ephy_uri_tester_test_uri (extension->uri_tester, request_uri, page_uri);
if (ret)
@@ -275,7 +274,7 @@ request_decision_on_storing (EphyEmbedFormAuth *form_auth)
static void
should_store_cb (const char *username,
const char *password,
- gpointer user_data)
+ gpointer user_data)
{
EphyEmbedFormAuth *form_auth = EPHY_EMBED_FORM_AUTH (user_data);
@@ -310,8 +309,8 @@ should_store_cb (const char *username,
static gboolean
form_submitted_cb (WebKitDOMHTMLFormElement *dom_form,
- WebKitDOMEvent *dom_event,
- WebKitWebPage *web_page)
+ WebKitDOMEvent *dom_event,
+ WebKitWebPage *web_page)
{
EphyEmbedFormAuth *form_auth;
SoupURI *uri;
@@ -360,7 +359,7 @@ form_submitted_cb (WebKitDOMHTMLFormElement *dom_form,
static void
fill_form_cb (const char *username,
const char *password,
- gpointer user_data)
+ gpointer user_data)
{
EphyEmbedFormAuth *form_auth = EPHY_EMBED_FORM_AUTH (user_data);
WebKitDOMNode *username_node;
@@ -380,7 +379,7 @@ fill_form_cb (const char *username,
}
static gint
-ephy_form_auth_data_compare (EphyFormAuthData *form_data,
+ephy_form_auth_data_compare (EphyFormAuthData *form_data,
EphyEmbedFormAuth *form_auth)
{
WebKitDOMNode *username_node;
@@ -395,7 +394,7 @@ ephy_form_auth_data_compare (EphyFormAuthData *form_data,
"name", &password_field_name, NULL);
retval = g_strcmp0 (username_field_name, form_data->form_username) == 0 &&
- g_strcmp0 (password_field_name, form_data->form_password) == 0;
+ g_strcmp0 (password_field_name, form_data->form_password) == 0;
g_free (username_field_name);
g_free (password_field_name);
@@ -444,7 +443,7 @@ pre_fill_form (EphyEmbedFormAuth *form_auth)
username,
fill_form_cb,
g_object_ref (form_auth),
- (GDestroyNotify) g_object_unref);
+ (GDestroyNotify)g_object_unref);
g_free (username);
g_free (uri_str);
@@ -467,8 +466,8 @@ remove_user_choices (WebKitDOMDocument *document)
}
static gboolean
-username_changed_cb (WebKitDOMNode *username_node,
- WebKitDOMEvent *dom_event,
+username_changed_cb (WebKitDOMNode *username_node,
+ WebKitDOMEvent *dom_event,
EphyEmbedFormAuth *form_auth)
{
pre_fill_form (form_auth);
@@ -481,7 +480,7 @@ user_chosen_cb (WebKitDOMNode *li,
WebKitDOMNode *username_node)
{
WebKitDOMElement *anchor;
- const char* username;
+ const char *username;
anchor = webkit_dom_element_get_first_element_child (WEBKIT_DOM_ELEMENT (li));
@@ -494,7 +493,7 @@ user_chosen_cb (WebKitDOMNode *li,
}
GtkStyleContext *global_entry_context = NULL;
-static GtkStyleContext*
+static GtkStyleContext *
get_entry_style_context (void)
{
GtkWidgetPath *path;
@@ -513,7 +512,7 @@ get_entry_style_context (void)
return global_entry_context;
}
-static char*
+static char *
get_selected_bgcolor (void)
{
GdkRGBA color;
@@ -525,7 +524,7 @@ get_selected_bgcolor (void)
return gdk_rgba_to_string (&color);
}
-static char*
+static char *
get_selected_fgcolor (void)
{
GdkRGBA color;
@@ -537,7 +536,7 @@ get_selected_fgcolor (void)
return gdk_rgba_to_string (&color);
}
-static char*
+static char *
get_bgcolor (void)
{
GdkRGBA color;
@@ -549,7 +548,7 @@ get_bgcolor (void)
return gdk_rgba_to_string (&color);
}
-static char*
+static char *
get_fgcolor (void)
{
GdkRGBA color;
@@ -561,7 +560,7 @@ get_fgcolor (void)
return gdk_rgba_to_string (&color);
}
-static char*
+static char *
get_user_choice_style (gboolean selected)
{
char *style_attribute;
@@ -581,7 +580,7 @@ get_user_choice_style (gboolean selected)
return style_attribute;
}
-static char*
+static char *
get_user_choice_anchor_style (gboolean selected)
{
char *style_attribute;
@@ -613,7 +612,7 @@ show_user_choices (WebKitDOMDocument *document,
double x, y;
double input_width;
char *style_attribute;
- char* username;
+ char *username;
g_object_get (username_node,
"value", &username,
@@ -654,8 +653,8 @@ show_user_choices (WebKitDOMDocument *document,
"padding: 0;",
NULL);
- auth_data_list = (GSList*)g_object_get_data (G_OBJECT (username_node),
- "ephy-auth-data-list");
+ auth_data_list = (GSList *)g_object_get_data (G_OBJECT (username_node),
+ "ephy-auth-data-list");
username_node_ever_edited =
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (username_node),
@@ -668,13 +667,13 @@ show_user_choices (WebKitDOMDocument *document,
char *child_style;
gboolean is_selected;
- data = (EphyFormAuthData*)iter->data;
+ data = (EphyFormAuthData *)iter->data;
/* Filter out the available names that do not match, but show all options in
* case we have been triggered by something other than the user editing the
* input.
*/
- if (username_node_ever_edited && !g_str_has_prefix(data->username, username))
+ if (username_node_ever_edited && !g_str_has_prefix (data->username, username))
continue;
is_selected = !g_strcmp0 (username, data->username);
@@ -713,7 +712,7 @@ show_user_choices (WebKitDOMDocument *document,
NULL);
}
- g_free (username);
+ g_free (username);
body = WEBKIT_DOM_NODE (webkit_dom_document_get_body (document));
webkit_dom_node_append_child (WEBKIT_DOM_NODE (body),
WEBKIT_DOM_NODE (main_div),
@@ -755,8 +754,8 @@ clear_password_field (WebKitDOMNode *username_node)
EphyEmbedFormAuth *form_auth;
WebKitDOMNode *password_node;
- form_auth = (EphyEmbedFormAuth*)g_object_get_data (G_OBJECT (username_node),
- "ephy-form-auth");
+ form_auth = (EphyEmbedFormAuth *)g_object_get_data (G_OBJECT (username_node),
+ "ephy-form-auth");
password_node = ephy_embed_form_auth_get_password_node (form_auth);
webkit_dom_html_input_element_set_value (WEBKIT_DOM_HTML_INPUT_ELEMENT (password_node), "");
@@ -767,8 +766,8 @@ pre_fill_password (WebKitDOMNode *username_node)
{
EphyEmbedFormAuth *form_auth;
- form_auth = (EphyEmbedFormAuth*)g_object_get_data (G_OBJECT (username_node),
- "ephy-form-auth");
+ form_auth = (EphyEmbedFormAuth *)g_object_get_data (G_OBJECT (username_node),
+ "ephy-form-auth");
pre_fill_form (form_auth);
}
@@ -781,7 +780,7 @@ username_node_keydown_cb (WebKitDOMNode *username_node,
WebKitDOMDocument *document;
WebKitDOMElement *main_div;
WebKitDOMElement *container;
- WebKitDOMElement *selected= NULL;
+ WebKitDOMElement *selected = NULL;
WebKitDOMElement *to_select = NULL;
WebKitDOMElement *anchor;
WebKitDOMKeyboardEvent *keyboard_event;
@@ -883,7 +882,7 @@ username_node_input_cb (WebKitDOMNode *username_node,
WebKitDOMDocument *document;
WebKitDOMElement *main_div;
- g_object_set_data (G_OBJECT (username_node), "ephy-user-ever-edited", GINT_TO_POINTER(TRUE));
+ g_object_set_data (G_OBJECT (username_node), "ephy-user-ever-edited", GINT_TO_POINTER (TRUE));
document = webkit_web_page_get_dom_document (web_page);
remove_user_choices (document);
show_user_choices (document, username_node);
@@ -905,7 +904,7 @@ form_destroyed_cb (gpointer form_auth, GObject *form)
}
static void
-web_page_document_loaded (WebKitWebPage *web_page,
+web_page_document_loaded (WebKitWebPage *web_page,
EphyWebExtension *extension)
{
WebKitDOMHTMLCollection *forms = NULL;
@@ -923,7 +922,7 @@ web_page_document_loaded (WebKitWebPage *web_page,
if (forms_n == 0) {
LOG ("No forms found.");
- g_object_unref(forms);
+ g_object_unref (forms);
return;
}
@@ -992,12 +991,12 @@ web_page_document_loaded (WebKitWebPage *web_page,
LOG ("No pre-fillable/hookable form found");
}
- g_object_unref(forms);
+ g_object_unref (forms);
}
static void
-web_page_uri_changed (WebKitWebPage *web_page,
- GParamSpec *param_spec,
+web_page_uri_changed (WebKitWebPage *web_page,
+ GParamSpec *param_spec,
EphyWebExtension *extension)
{
EphyWebOverview *overview = NULL;
@@ -1009,10 +1008,10 @@ web_page_uri_changed (WebKitWebPage *web_page,
}
static gboolean
-web_page_context_menu (WebKitWebPage *web_page,
- WebKitContextMenu *context_menu,
+web_page_context_menu (WebKitWebPage *web_page,
+ WebKitContextMenu *context_menu,
WebKitWebHitTestResult *hit_test_result,
- gpointer user_data)
+ gpointer user_data)
{
char *string;
GVariantBuilder builder;
@@ -1028,8 +1027,7 @@ web_page_context_menu (WebKitWebPage *web_page,
string = ephy_web_dom_utils_get_selection_as_string (selection);
g_object_unref (selection);
- if (!string || *string == '\0')
- {
+ if (!string || *string == '\0') {
g_free (string);
return FALSE;
}
@@ -1046,7 +1044,7 @@ web_page_context_menu (WebKitWebPage *web_page,
static void
ephy_web_extension_emit_page_created (EphyWebExtension *extension,
- guint64 page_id)
+ guint64 page_id)
{
GError *error = NULL;
@@ -1084,7 +1082,7 @@ ephy_web_extension_emit_page_created_signals_pending (EphyWebExtension *extensio
static void
ephy_web_extension_queue_page_created_signal_emission (EphyWebExtension *extension,
- guint64 page_id)
+ guint64 page_id)
{
if (!extension->page_created_signals_pending)
extension->page_created_signals_pending = g_array_new (FALSE, FALSE, sizeof (guint64));
@@ -1093,7 +1091,7 @@ ephy_web_extension_queue_page_created_signal_emission (EphyWebExtension *extensi
static void
ephy_web_extension_page_created_cb (EphyWebExtension *extension,
- WebKitWebPage *web_page)
+ WebKitWebPage *web_page)
{
guint64 page_id;
@@ -1119,8 +1117,8 @@ ephy_web_extension_page_created_cb (EphyWebExtension *extension,
static WebKitWebPage *
get_webkit_web_page_or_return_dbus_error (GDBusMethodInvocation *invocation,
- WebKitWebExtension *web_extension,
- guint64 page_id)
+ WebKitWebExtension *web_extension,
+ guint64 page_id)
{
WebKitWebPage *web_page = webkit_web_extension_get_page (web_extension, page_id);
if (!web_page) {
@@ -1131,14 +1129,14 @@ get_webkit_web_page_or_return_dbus_error (GDBusMethodInvocation *invocation,
}
static void
-handle_method_call (GDBusConnection *connection,
- const char *sender,
- const char *object_path,
- const char *interface_name,
- const char *method_name,
- GVariant *parameters,
+handle_method_call (GDBusConnection *connection,
+ const char *sender,
+ const char *object_path,
+ const char *interface_name,
+ const char *method_name,
+ GVariant *parameters,
GDBusMethodInvocation *invocation,
- gpointer user_data)
+ gpointer user_data)
{
EphyWebExtension *extension = EPHY_WEB_EXTENSION (user_data);
@@ -1195,7 +1193,7 @@ handle_method_call (GDBusConnection *connection,
return;
}
- document= webkit_web_page_get_dom_document (web_page);
+ document = webkit_web_page_get_dom_document (web_page);
result = ephy_web_dom_utils_get_best_icon (document, base_uri, &uri, &color);
g_dbus_method_invocation_return_value (invocation,
@@ -1298,9 +1296,9 @@ ephy_web_extension_dispose (GObject *object)
}
if (extension->page_created_signals_pending) {
- g_array_free (extension->page_created_signals_pending, TRUE);
- extension->page_created_signals_pending = NULL;
- }
+ g_array_free (extension->page_created_signals_pending, TRUE);
+ extension->page_created_signals_pending = NULL;
+ }
g_clear_object (&extension->cancellable);
g_clear_object (&extension->dbus_connection);
@@ -1325,7 +1323,7 @@ ephy_web_extension_init (EphyWebExtension *extension)
}
static gpointer
-ephy_web_extension_create_instance(gpointer data)
+ephy_web_extension_create_instance (gpointer data)
{
return g_object_new (EPHY_TYPE_WEB_EXTENSION, NULL);
}
@@ -1338,8 +1336,8 @@ ephy_web_extension_get (void)
}
static void
-dbus_connection_created_cb (GObject *source_object,
- GAsyncResult *result,
+dbus_connection_created_cb (GObject *source_object,
+ GAsyncResult *result,
EphyWebExtension *extension)
{
static GDBusNodeInfo *introspection_data = NULL;
@@ -1378,19 +1376,19 @@ dbus_connection_created_cb (GObject *source_object,
static gboolean
authorize_authenticated_peer_cb (GDBusAuthObserver *observer,
- GIOStream *stream,
- GCredentials *credentials,
- EphyWebExtension *extension)
+ GIOStream *stream,
+ GCredentials *credentials,
+ EphyWebExtension *extension)
{
return ephy_dbus_peer_is_authorized (credentials);
}
void
-ephy_web_extension_initialize (EphyWebExtension *extension,
+ephy_web_extension_initialize (EphyWebExtension *extension,
WebKitWebExtension *wk_extension,
- const char *server_address,
- const char *dot_dir,
- gboolean is_private_profile)
+ const char *server_address,
+ const char *dot_dir,
+ gboolean is_private_profile)
{
GDBusAuthObserver *observer;
diff --git a/embed/web-extension/ephy-web-overview-model.c b/embed/web-extension/ephy-web-overview-model.c
index 7a8687fdf..bc6f97523 100644
--- a/embed/web-extension/ephy-web-overview-model.c
+++ b/embed/web-extension/ephy-web-overview-model.c
@@ -21,8 +21,7 @@
#include <libsoup/soup.h>
-struct _EphyWebOverviewModel
-{
+struct _EphyWebOverviewModel {
GObject parent_instance;
GList *items;
@@ -31,8 +30,7 @@ struct _EphyWebOverviewModel
G_DEFINE_TYPE (EphyWebOverviewModel, ephy_web_overview_model, G_TYPE_OBJECT)
-enum
-{
+enum {
URLS_CHANGED,
THUMBNAIL_CHANGED,
TITLE_CHANGED,
@@ -110,7 +108,7 @@ ephy_web_overview_model_new (void)
void
ephy_web_overview_model_set_urls (EphyWebOverviewModel *model,
- GList *urls)
+ GList *urls)
{
g_return_if_fail (EPHY_IS_WEB_OVERVIEW_MODEL (model));
@@ -129,8 +127,8 @@ ephy_web_overview_model_get_urls (EphyWebOverviewModel *model)
void
ephy_web_overview_model_set_url_thumbnail (EphyWebOverviewModel *model,
- const char *url,
- const char *path)
+ const char *url,
+ const char *path)
{
const char *thumbnail_path;
@@ -146,7 +144,7 @@ ephy_web_overview_model_set_url_thumbnail (EphyWebOverviewModel *model,
const char *
ephy_web_overview_model_get_url_thumbnail (EphyWebOverviewModel *model,
- const char *url)
+ const char *url)
{
g_return_val_if_fail (EPHY_IS_WEB_OVERVIEW_MODEL (model), NULL);
@@ -155,8 +153,8 @@ ephy_web_overview_model_get_url_thumbnail (EphyWebOverviewModel *model,
void
ephy_web_overview_model_set_url_title (EphyWebOverviewModel *model,
- const char *url,
- const char *title)
+ const char *url,
+ const char *title)
{
GList *l;
gboolean changed = FALSE;
@@ -183,7 +181,7 @@ ephy_web_overview_model_set_url_title (EphyWebOverviewModel *model,
void
ephy_web_overview_model_delete_url (EphyWebOverviewModel *model,
- const char *url)
+ const char *url)
{
GList *l;
gboolean changed = FALSE;
@@ -211,7 +209,7 @@ ephy_web_overview_model_delete_url (EphyWebOverviewModel *model,
void
ephy_web_overview_model_delete_host (EphyWebOverviewModel *model,
- const char *host)
+ const char *host)
{
GList *l;
gboolean changed = FALSE;
diff --git a/embed/web-extension/ephy-web-overview.c b/embed/web-extension/ephy-web-overview.c
index 14ad5f674..e252bfe8c 100644
--- a/embed/web-extension/ephy-web-overview.c
+++ b/embed/web-extension/ephy-web-overview.c
@@ -25,8 +25,7 @@
#include <webkitdom/WebKitDOMElementUnstable.h>
#include <webkitdom/WebKitDOMDOMTokenList.h>
-struct _EphyWebOverview
-{
+struct _EphyWebOverview {
GObject parent_instance;
WebKitWebPage *web_page;
@@ -38,8 +37,7 @@ struct _EphyWebOverview
G_DEFINE_TYPE (EphyWebOverview, ephy_web_overview, G_TYPE_OBJECT)
-enum
-{
+enum {
PROP_0,
PROP_WEB_PAGE,
PROP_MODEL,
@@ -70,7 +68,7 @@ overview_item_new (WebKitDOMElement *anchor)
nodes = webkit_dom_node_get_child_nodes (WEBKIT_DOM_NODE (anchor));
n_nodes = webkit_dom_node_list_get_length (nodes);
for (i = 0; i < n_nodes; i++) {
- WebKitDOMNode* node = webkit_dom_node_list_item (nodes, i);
+ WebKitDOMNode *node = webkit_dom_node_list_item (nodes, i);
WebKitDOMElement *element;
char *tag;
@@ -111,7 +109,7 @@ overview_item_free (OverviewItem *item)
static void
update_thumbnail_element_style (WebKitDOMElement *thumbnail,
- const char *path)
+ const char *path)
{
char *style;
@@ -122,12 +120,12 @@ update_thumbnail_element_style (WebKitDOMElement *thumbnail,
static void
ephy_web_overview_model_urls_changed (EphyWebOverviewModel *model,
- EphyWebOverview *overview)
+ EphyWebOverview *overview)
{
GList *urls;
GList *l;
GList *items;
- OverviewItem* item;
+ OverviewItem *item;
urls = ephy_web_overview_model_get_urls (model);
@@ -250,9 +248,9 @@ apply_delayed_thumbnail_change (gpointer key,
static void
ephy_web_overview_model_thumbnail_changed (EphyWebOverviewModel *model,
- const char *url,
- const char *path,
- EphyWebOverview *overview)
+ const char *url,
+ const char *path,
+ EphyWebOverview *overview)
{
GList *l;
for (l = overview->items; l; l = g_list_next (l)) {
@@ -283,9 +281,9 @@ ephy_web_overview_model_thumbnail_changed (EphyWebOverviewModel *model,
static void
ephy_web_overview_model_title_changed (EphyWebOverviewModel *model,
- const char *url,
- const char *title,
- EphyWebOverview *overview)
+ const char *url,
+ const char *title,
+ EphyWebOverview *overview)
{
GList *l;
@@ -301,8 +299,8 @@ ephy_web_overview_model_title_changed (EphyWebOverviewModel *model,
}
static void
-ephy_web_overview_update_thumbnail_in_model_from_element (EphyWebOverview *overview,
- const char *url,
+ephy_web_overview_update_thumbnail_in_model_from_element (EphyWebOverview *overview,
+ const char *url,
WebKitDOMElement *thumbnail)
{
WebKitDOMCSSStyleDeclaration *style;
@@ -342,7 +340,7 @@ ephy_web_overview_update_thumbnail_in_model_from_element (EphyWebOverview *overv
}
static void
-ephy_web_overview_document_loaded (WebKitWebPage *web_page,
+ephy_web_overview_document_loaded (WebKitWebPage *web_page,
EphyWebOverview *overview)
{
WebKitDOMDocument *document;
@@ -353,7 +351,7 @@ ephy_web_overview_document_loaded (WebKitWebPage *web_page,
nodes = webkit_dom_document_get_elements_by_tag_name (document, "a");
n_nodes = webkit_dom_node_list_get_length (nodes);
for (i = 0; i < n_nodes; i++) {
- WebKitDOMElement* element = WEBKIT_DOM_ELEMENT (webkit_dom_node_list_item (nodes, i));
+ WebKitDOMElement *element = WEBKIT_DOM_ELEMENT (webkit_dom_node_list_item (nodes, i));
char *class;
class = webkit_dom_element_get_class_name (element);
@@ -381,24 +379,23 @@ ephy_web_overview_document_loaded (WebKitWebPage *web_page,
}
static void
-ephy_web_overview_set_property (GObject *object,
- guint prop_id,
+ephy_web_overview_set_property (GObject *object,
+ guint prop_id,
const GValue *value,
- GParamSpec *pspec)
+ GParamSpec *pspec)
{
EphyWebOverview *overview = EPHY_WEB_OVERVIEW (object);
- switch (prop_id)
- {
- case PROP_WEB_PAGE:
- overview->web_page = g_value_get_object (value);
- break;
- case PROP_MODEL:
- overview->model = g_value_get_object (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ switch (prop_id) {
+ case PROP_WEB_PAGE:
+ overview->web_page = g_value_get_object (value);
+ break;
+ case PROP_MODEL:
+ overview->model = g_value_get_object (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
@@ -471,7 +468,7 @@ ephy_web_overview_init (EphyWebOverview *overview)
}
EphyWebOverview *
-ephy_web_overview_new (WebKitWebPage *web_page,
+ephy_web_overview_new (WebKitWebPage *web_page,
EphyWebOverviewModel *model)
{
g_return_val_if_fail (WEBKIT_IS_WEB_PAGE (web_page), NULL);
View Lorry Controller Status