diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-11-12 13:51:00 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-11-13 15:05:25 +0100 |
| commit | 16030b29e4a8d4807471dcd4e61068b48a329e8d (patch) | |
| tree | 88bf4ba13227dbf333ddd6beed6c5acef6be258e | |
| parent | 68d997bdb44525c82a7bec618764a952731daaa8 (diff) | |
| download | NetworkManager-16030b29e4a8d4807471dcd4e61068b48a329e8d.tar.gz | |
firewall: allow passing NULL callback to nm_firewall_manager_add_or_change_zone()
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/nm-firewall-manager.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index d3e3777d44..7a81731d84 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -117,7 +117,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); @@ -137,7 +138,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; } |