colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firewall-manager: handle bus connection failure

Browse Source
This commit is contained in:
Lubomir Rintel
2015-09-30 15:27:06 +02:00
parent a9b1869d63
commit 30a0c3164c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nm-firewall-manager.c
View File

@@ -445,6 +445,7 @@ constructed (GObject *object)
NMFirewallManager *self = (NMFirewallManager *) object; NMFirewallManager *self = (NMFirewallManager *) object;
NMFirewallManagerPrivate *priv = NM_FIREWALL_MANAGER_GET_PRIVATE (self); NMFirewallManagerPrivate *priv = NM_FIREWALL_MANAGER_GET_PRIVATE (self);
gs_free char *owner = NULL; gs_free char *owner = NULL;
gs_free_error GError *error = NULL;
G_OBJECT_CLASS (nm_firewall_manager_parent_class)->constructed (object); G_OBJECT_CLASS (nm_firewall_manager_parent_class)->constructed (object);
@@ -455,12 +456,16 @@ constructed (GObject *object)
FIREWALL_DBUS_SERVICE, FIREWALL_DBUS_SERVICE,
FIREWALL_DBUS_PATH, FIREWALL_DBUS_PATH,
FIREWALL_DBUS_INTERFACE_ZONE, FIREWALL_DBUS_INTERFACE_ZONE,
NULL, NULL); NULL, &error);
if (priv->proxy) {
g_signal_connect (priv->proxy, "notify::g-name-owner",
G_CALLBACK (name_owner_changed), self);
owner = g_dbus_proxy_get_name_owner (priv->proxy);
priv->running = (owner != NULL);
} else {
_LOGW (NULL, "could not connect to system D-Bus (%s)", error->message);
}
g_signal_connect (priv->proxy, "notify::g-name-owner",
G_CALLBACK (name_owner_changed), self);
owner = g_dbus_proxy_get_name_owner (priv->proxy);
priv->running = (owner != NULL);
_LOGD (NULL, "firewall constructed (%srunning)", priv->running ? "" : "not"); _LOGD (NULL, "firewall constructed (%srunning)", priv->running ? "" : "not");
} }