From 23313d711ff7a328e96d1bc2da084bcb6266b3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Fri, 9 Oct 2015 20:31:29 +0200 Subject: [PATCH] macros: allow NULL pointer in nm_clear_g_signal_handler() It does not make sense to issue an error. This should be a helper function. "NetworkManager[18341]: nm_clear_g_signal_handler: assertion 'G_IS_OBJECT (self)' failed" error started since commit e6d7fee5a617632acae02e12b1ec6156842df788 due to that. (cherry picked from commit c33416178f88353b2f424a18c576de09b6ae3215) --- include/nm-macros-internal.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/nm-macros-internal.h b/include/nm-macros-internal.h index c4a60faa28..4d9979f3f5 100644 --- a/include/nm-macros-internal.h +++ b/include/nm-macros-internal.h @@ -260,7 +260,8 @@ nm_clear_g_source (guint *id) static inline gboolean nm_clear_g_signal_handler (gpointer self, guint *id) { - g_return_val_if_fail (G_IS_OBJECT (self), FALSE); + if (!self) + return FALSE; if (id && *id) { g_signal_handler_disconnect (self, *id);