Updating branch refs/heads/master
to 0c11fff4b5ac807fc6b64aa92a0ea97c1bf312d2 (commit)
from 1a1fe868c240abd041fd61179b2cf2ca55530afd (commit)
commit 0c11fff4b5ac807fc6b64aa92a0ea97c1bf312d2
Author: Christian Dywan <[email protected]>
Date: Tue Nov 27 01:23:30 2012 +0100
Handle initially null block-uris regex
midori/midori-settings.vala | 2 +-
tests/browser.c | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/midori/midori-settings.vala b/midori/midori-settings.vala
index 7bf4aff..4580030 100644
--- a/midori/midori-settings.vala
+++ b/midori/midori-settings.vala
@@ -41,7 +41,7 @@ namespace Midori {
GLib.Regex? block_uris_regex = null;
/* Since: 0.4.8 */
public string? block_uris { get {
- return block_uris_regex.get_pattern ();
+ return block_uris_regex != null ? block_uris_regex.get_pattern ()
: null;
} set {
if (value == null || value == "")
return;
diff --git a/tests/browser.c b/tests/browser.c
index a9bb6a2..3c53490 100644
--- a/tests/browser.c
+++ b/tests/browser.c
@@ -162,9 +162,11 @@ static void
browser_block_uris (void)
{
MidoriWebSettings* settings = g_object_new (MIDORI_TYPE_WEB_SETTINGS,
NULL);
+ gchar* pattern = katze_object_get_string (settings, "block-uris");
g_object_set (settings, "block-uris", NULL, NULL);
g_object_set (settings, "block-uris", "", NULL);
g_object_set (settings, "block-uris",
"^(?!.*?(gmail|mail\\.google|accounts\\.google)).*", NULL);
+ g_free (pattern);
g_object_unref (settings);
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
