[epiphany] ephy-web-view: share non-search-regex for testing
- From: Diego Escalante Urrelo <diegoe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-web-view: share non-search-regex for testing
- Date: Sat, 10 Mar 2012 19:16:26 +0000 (UTC)
commit 643d1fd862ad9db0132fd4917d5db9d491070cc8
Author: Diego Escalante Urrelo <diegoe igalia com>
Date: Thu Feb 9 18:03:22 2012 -0500
ephy-web-view: share non-search-regex for testing
Add ephy-embed-private.h
https://bugzilla.gnome.org/show_bug.cgi?id=669548
embed/Makefile.am | 1 +
embed/ephy-embed-private.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
embed/ephy-web-view.c | 11 ++---------
3 files changed, 47 insertions(+), 9 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index fee25a9..ff79e02 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -9,6 +9,7 @@ header_DATA = \
NOINST_H_FILES = \
ephy-embed-dialog.h \
+ ephy-embed-private.h \
ephy-encodings.h \
ephy-favicon-cache.h \
ephy-request-about.h \
diff --git a/embed/ephy-embed-private.h b/embed/ephy-embed-private.h
new file mode 100644
index 0000000..17c6ad8
--- /dev/null
+++ b/embed/ephy-embed-private.h
@@ -0,0 +1,44 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * Copyright  2012 Igalia S.L.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
+#ifndef EPHY_EMBED_PRIVATE_H
+#define EPHY_EMBED_PRIVATE_H
+
+/* EphyWebView */
+
+#define EPHY_WEB_VIEW_NON_SEARCH_REGEX "(" \
+ "^localhost(\\.[^[:space:]]+)?(:\\d+)?(/.*)?$|" \
+ "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]$|" \
+ "^::[0-9a-f:]*$|" \
+ "^[0-9a-f:]+:[0-9a-f:]*$|" \
+ "^[^\\.[:space:]]+\\.[^\\.[:space:]]+.*$|" \
+ "^https?://[^/\\.[:space:]]+.*$|" \
+ "^about:.*$|" \
+ "^data:.*$|" \
+ "^file:.*$" \
+ ")"
+
+
+#endif
+
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 404b616..2295e69 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -26,6 +26,7 @@
#include "ephy-debug.h"
#include "ephy-embed-container.h"
#include "ephy-embed-prefs.h"
+#include "ephy-embed-private.h"
#include "ephy-embed-shell.h"
#include "ephy-embed-single.h"
#include "ephy-embed-type-builtins.h"
@@ -2248,15 +2249,7 @@ ephy_web_view_init (EphyWebView *web_view)
priv->security_level = EPHY_WEB_VIEW_STATE_IS_UNKNOWN;
priv->monitor_directory = FALSE;
- priv->non_search_regex = g_regex_new ("(^localhost(\\.[^[:space:]]+)?(:\\d+)?(/.*)?$|"
- "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]$|"
- "^::[0-9a-f:]*$|" /* IPv6 literals */
- "^[0-9a-f:]+:[0-9a-f:]*$|" /* IPv6 literals */
- "^[^\\.[:space:]]+\\.[^\\.[:space:]]+.*$|" /* foo.bar... */
- "^https?://[^/\\.[:space:]]+.*$|"
- "^about:.*$|"
- "^data:.*$|"
- "^file:.*$)",
+ priv->non_search_regex = g_regex_new (EPHY_WEB_VIEW_NON_SEARCH_REGEX,
G_REGEX_OPTIMIZE, G_REGEX_MATCH_NOTEMPTY, NULL);
g_signal_connect (web_view, "mime-type-policy-decision-requested",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]