diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
| commit | 54de7f04d1fac5f29fd54ec4120ba2fc4f9b5714 (patch) | |
| tree | 87729385ff8de744dc44d0b4cc75916494b2fd38 /src/nm-firewall-manager.c | |
| parent | 680d3db45106e7a18665a366e1b57e58cef61506 (diff) | |
| parent | 329b15110c4b183d7a47552abe3a6a6ff933e817 (diff) | |
Merge branch 'experimental'
Diffstat (limited to 'src/nm-firewall-manager.c')
| -rw-r--r-- | src/nm-firewall-manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 216d5fc8..5b5e7cfa 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -25,7 +25,7 @@ #include <string.h> #include "NetworkManagerUtils.h" -#include "nm-utils/c-list.h" +#include "c-list/src/c-list.h" /*****************************************************************************/ @@ -174,7 +174,7 @@ _cb_info_create (NMFirewallManager *self, if (priv->running || priv->proxy_cancellable) { info->mode_mutable = CB_INFO_MODE_DBUS_WAITING; - info->dbus.arg = g_variant_new ("(ss)", zone ? zone : "", iface); + info->dbus.arg = g_variant_new ("(ss)", zone ?: "", iface); } else info->mode_mutable = CB_INFO_MODE_IDLE; |