2810f88
From c36872f048824248ff8348eaf66134194becaedc Mon Sep 17 00:00:00 2001
2810f88
From: Erik van Pienbroek <epienbro@fedoraproject.org>
2810f88
Date: Thu, 17 Jul 2014 21:24:28 +0200
2810f88
Subject: [PATCH 2/2] GNetworkMonitorBase: don't fail when IPv6 support is
2810f88
 unavailable
2810f88
2810f88
---
2810f88
 gio/gnetworkmonitorbase.c | 10 ++++++++--
2810f88
 1 file changed, 8 insertions(+), 2 deletions(-)
2810f88
2810f88
diff --git a/gio/gnetworkmonitorbase.c b/gio/gnetworkmonitorbase.c
1853c99
index f0af804..32ffc74 100644
2810f88
--- a/gio/gnetworkmonitorbase.c
2810f88
+++ b/gio/gnetworkmonitorbase.c
1853c99
@@ -100,8 +100,14 @@ g_network_monitor_base_constructed (GObject *object)
2810f88
       g_object_unref (mask);
2810f88
 
2810f88
       mask = g_inet_address_mask_new_from_string ("::/0", NULL);
2810f88
-      g_network_monitor_base_add_network (monitor, mask);
2810f88
-      g_object_unref (mask);
2810f88
+      if (mask)
2810f88
+        {
2810f88
+          /* On some environments (for example Windows without IPv6 support
2810f88
+           * enabled) the string "::/0" can't be processed and causes
2810f88
+           * g_inet_address_mask_new_from_string to return NULL */
2810f88
+          g_network_monitor_base_add_network (monitor, mask);
2810f88
+          g_object_unref (mask);
2810f88
+        }
2810f88
     }
2810f88
 }
2810f88
 
2810f88
-- 
2810f88
2.0.1
2810f88