diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-10-09 20:31:29 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-12 11:14:31 +0200 |
| commit | 23313d711ff7a328e96d1bc2da084bcb6266b3f0 (patch) | |
| tree | 980c0b4ce8bbcf181ab677ec70aa89ef12178d41 | |
| parent | a77a3aa7ddc79695d6b30960826306ab98068e1c (diff) | |
| download | NetworkManager-23313d711ff7a328e96d1bc2da084bcb6266b3f0.tar.gz | |
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)
| -rw-r--r-- | include/nm-macros-internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
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); |