[smuxi/stable: 24/24] Frontend-GNOME: guard DBus code with null checks in NetworkManager.Init()

[Mirco M. M. Bauer <mmmbauer src gnome org>]

commit 614b59c50ff15a18be181154771806f4b270cdaf
Author: Mirco Bauer <meebey meebey net>
Date:   Thu Apr 23 04:26:19 2015 +0200

    Frontend-GNOME: guard DBus code with null checks in NetworkManager.Init()

 src/Frontend-GNOME/NetworkManager.cs |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/src/Frontend-GNOME/NetworkManager.cs b/src/Frontend-GNOME/NetworkManager.cs
index be3c625..d83de6b 100644
--- a/src/Frontend-GNOME/NetworkManager.cs
+++ b/src/Frontend-GNOME/NetworkManager.cs
@@ -1,6 +1,6 @@
 // Smuxi - Smart MUltipleXed Irc
 // 
-// Copyright (c) 2011 Mirco Bauer <meebey meebey net>
+// Copyright (c) 2011, 2013, 2015 Mirco Bauer <meebey meebey net>
 // 
 // Full GPL License: <http://www.gnu.org/licenses/gpl.txt>
 // 
@@ -91,13 +91,24 @@ namespace Smuxi.Frontend.Gnome
         {
             BusG.Init();
 
-            if (!Bus.System.NameHasOwner(BusName)) {
+            var dbus = Bus.System;
+            if (!dbus.NameHasOwner(BusName)) {
+#if LOG4NET
+                Logger.Info("Init(): no DBus provider for network manager found, " +
+                            "disabling...");
+#endif
                 return;
             }
 
-            Manager = Bus.System.GetObject<INetworkManager>(
+            Manager = dbus.GetObject<INetworkManager>(
                 BusName, new ObjectPath(ObjectPath)
             );
+            if (Manager == null) {
+#if LOG4NET
+                Logger.Warn("Init(): DBus object is null, bailing out!");
+#endif
+                return;
+            }
             Manager.StateChanged += OnStateChanged;
 
             IsInitialized = true;