diff options
| author | Michael Biebl <biebl@debian.org> | 2012-06-29 20:12:59 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-06-29 20:12:59 +0200 |
| commit | ec7b2a4d322996da1e4b221f2f713652bf868d3b (patch) | |
| tree | 88cd588a74c0de932f7cac871273b08b86fd759c /libnm-util/nm-setting-bluetooth.c | |
| parent | 1376a21247cfd9d8bb1d4da7195112d03ff6e870 (diff) | |
| parent | 867254ea7c2b193fecf8cd36cc6e5dc53c290d92 (diff) | |
Merge tag 'upstream/0.9.5.95' into experimental
Upstream version 0.9.5.95
Diffstat (limited to 'libnm-util/nm-setting-bluetooth.c')
| -rw-r--r-- | libnm-util/nm-setting-bluetooth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c index 6a2fed74..52f0b81e 100644 --- a/libnm-util/nm-setting-bluetooth.c +++ b/libnm-util/nm-setting-bluetooth.c @@ -104,7 +104,7 @@ NMSetting *nm_setting_bluetooth_new (void) const char * nm_setting_bluetooth_get_connection_type (NMSettingBluetooth *setting) { - g_return_val_if_fail (NM_IS_SETTING_BLUETOOTH (setting), 0); + g_return_val_if_fail (NM_IS_SETTING_BLUETOOTH (setting), NULL); return NM_SETTING_BLUETOOTH_GET_PRIVATE (setting)->type; } |