[Xfce4-commits] <midori:master> Never install block URI handle for null or ""

[Christian Dywan]

Updating branch refs/heads/master
         to 4c10283dc9f1d0b73fb68668eb9189ceb0e122fe (commit)
       from 88cb2de37192c6c65e289f3966e04e6c4b5d408a (commit)

commit 4c10283dc9f1d0b73fb68668eb9189ceb0e122fe
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Nov 25 13:29:22 2012 +0100

    Never install block URI handle for null or ""

 midori/midori-settings.vala |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/midori/midori-settings.vala b/midori/midori-settings.vala
index 9ed0810..7bf4aff 100644
--- a/midori/midori-settings.vala
+++ b/midori/midori-settings.vala
@@ -38,11 +38,13 @@ namespace Midori {
         /* Since: 0.4.8 */
         public uint inactivity_reset { get; set; default = 0; }
 
-        GLib.Regex block_uris_regex;
+        GLib.Regex? block_uris_regex = null;
         /* Since: 0.4.8 */
         public string? block_uris { get {
             return block_uris_regex.get_pattern ();
         } set {
+            if (value == null || value == "")
+                return;
             if (block_uris_regex == null)
                 WebKit.get_default_session ().request_queued.connect ((msg) => {
                     if (block_uris_regex.match (msg.uri.to_string (false)))
@@ -54,7 +56,7 @@ namespace Midori {
             catch (Error error) {
                 critical ("block-uris: %s", error.message);
             }
-        } default = null; }
+        } }
 
         public string? location_entry_search { get; set; default = null; }
         /* Since: 0.1.7 */