luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'network-monitor-fix' into 'master'

Browse Source 
network monitor portal: update properties initially

See merge request GNOME/glib!248
This commit is contained in:
Matthias Clasen 2018-08-16 23:31:57 +00:00
commit 76419d7d7d
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gio/gnetworkmonitorportal.c
View File

@ -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