From c2de0d98ba39e0a1a970d066fd19be786092f376 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 1 Mar 2016 16:55:22 +0100 Subject: Imported Upstream version 1.1.91 --- src/devices/bluetooth/nm-bluez-manager.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/devices/bluetooth/nm-bluez-manager.c') diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c index 6903356c..f66b5abe 100644 --- a/src/devices/bluetooth/nm-bluez-manager.c +++ b/src/devices/bluetooth/nm-bluez-manager.c @@ -18,14 +18,13 @@ * Copyright (C) 2013 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include #include #include #include -#include "nm-default.h" #include "nm-bluez-manager.h" #include "nm-device-factory.h" #include "nm-setting-bluetooth.h" @@ -397,6 +396,10 @@ dispose (GObject *object) cleanup_checking (self, TRUE); priv->bluez_version = 0; + + g_clear_object (&priv->provider); + + G_OBJECT_CLASS (nm_bluez_manager_parent_class)->dispose (object); } static void @@ -404,8 +407,7 @@ nm_bluez_manager_init (NMBluezManager *self) { NMBluezManagerPrivate *priv = NM_BLUEZ_MANAGER_GET_PRIVATE (self); - priv->provider = nm_connection_provider_get (); - g_assert (priv->provider); + priv->provider = g_object_ref (nm_connection_provider_get ()); } static NMDevice * -- cgit 1.3.0-6-gf8a5