From b2a3cf4f1db4356bc99b0f1af518600072cb606a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 12 Nov 2014 13:51:00 +0100 Subject: [PATCH] firewall: allow passing NULL callback to nm_firewall_manager_add_or_change_zone() Signed-off-by: Thomas Haller --- src/nm-firewall-manager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index bb033818c6..c44c489aa7 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -119,7 +119,8 @@ add_or_change_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data info->iface, info->id); } - info->callback (error, info->user_data); + if (info->callback) + info->callback (error, info->user_data); info->completed = TRUE; g_free (zone); @@ -139,7 +140,8 @@ nm_firewall_manager_add_or_change_zone (NMFirewallManager *self, if (priv->running == FALSE) { nm_log_dbg (LOGD_FIREWALL, "(%s) firewall zone add/change skipped (not running)", iface); - callback (NULL, user_data); + if (callback) + callback (NULL, user_data); return NULL; }