firewall-manager: avoid leaving dangling request if firewalld is not running

Unhook it prior to deallocation. Fixes an assertion on daemon shutdown:

  NetworkManager[30037]: <info>  exiting (success)
  **
  NetworkManager:ERROR:nm-firewall-manager.c:489:dispose: assertion failed: (g_hash_table_size (priv->pending_calls) == 0)
  Aborted (core dumped)

Fixes: 94f888a262
This commit is contained in:
Lubomir Rintel 2015-09-29 13:55:38 +02:00
parent b38bc15747
commit 8b0bb7a022

View file

@ -325,7 +325,7 @@ _start_request (NMFirewallManager *self,
* there is no point in scheduling an idle-request to fake success. Just
* return right away. */
_LOGD (info, "complete: drop request simulating success");
_cb_info_free (info);
_cb_info_complete_normal (info, NULL);
return NULL;
} else
info->idle.id = g_idle_add (_handle_idle, info);