Commit d0f6a59f authored by Matthias Clasen's avatar Matthias Clasen

network monitor portal: update properties initially

With version 2, we need to query the values explicitly.
The properties made this automatic.
parent 7ddd1de0
Pipeline #25392 failed with stage
in 4 minutes and 43 seconds
......@@ -181,6 +181,15 @@ got_connectivity (GObject *source,
}
}
static void
update_properties (GDBusProxy *proxy,
GNetworkMonitorPortal *nm)
{
g_dbus_proxy_call (proxy, "GetConnectivity", NULL, 0, -1, NULL, got_connectivity, nm);
g_dbus_proxy_call (proxy, "GetMetered", NULL, 0, -1, NULL, got_metered, nm);
g_dbus_proxy_call (proxy, "GetAvailable", NULL, 0, -1, NULL, got_available, nm);
}
static void
proxy_signal (GDBusProxy *proxy,
const char *sender,
......@@ -200,9 +209,7 @@ proxy_signal (GDBusProxy *proxy,
}
else if (nm->priv->version == 2)
{
g_dbus_proxy_call (proxy, "GetConnectivity", NULL, 0, -1, NULL, got_connectivity, nm);
g_dbus_proxy_call (proxy, "GetMetered", NULL, 0, -1, NULL, got_metered, nm);
g_dbus_proxy_call (proxy, "GetAvailable", NULL, 0, -1, NULL, got_available, nm);
update_properties (proxy, nm);
}
}
......@@ -326,7 +333,13 @@ g_network_monitor_portal_initable_init (GInitable *initable,
nm->priv->has_network = glib_network_available_in_sandbox ();
nm->priv->version = version;
return initable_parent_iface->init (initable, cancellable, error);
if (!initable_parent_iface->init (initable, cancellable, error))
return FALSE;
if (nm->priv->has_network && nm->priv->version == 2)
update_properties (proxy, nm);
return TRUE;
}
static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment