luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/fmuellner/nm-portal-changed-signal' into 'master'

Browse Source 
portal network monitor: Always emit changed signal on changed

See merge request GNOME/glib!294
This commit is contained in:
Philip Withnall 2018-09-03 12:14:18 +00:00
commit 8f157d0274
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gnetworkmonitorportal.c
View File

@ -260,7 +260,6 @@ got_status (GObject *source,
GNetworkMonitorPortal *nm = G_NETWORK_MONITOR_PORTAL (data);
GError *error = NULL;
GVariant *ret;
gboolean should_emit_changed = FALSE;
GVariant *status;
gboolean available;
gboolean metered;
@ -297,14 +296,12 @@ got_status (GObject *source,
{
nm->priv->available = available;
g_object_notify (G_OBJECT (nm), "network-available");
should_emit_changed = TRUE;
}
if (nm->priv->metered != metered)
{
nm->priv->metered = metered;
g_object_notify (G_OBJECT (nm), "network-metered");
should_emit_changed = TRUE;
}
if (nm->priv->connectivity != connectivity &&
@ -312,13 +309,11 @@ got_status (GObject *source,
{
nm->priv->connectivity = connectivity;
g_object_notify (G_OBJECT (nm), "connectivity");
should_emit_changed = TRUE;
}
g_object_thaw_notify (G_OBJECT (nm));
if (should_emit_changed)
g_signal_emit_by_name (nm, "network-changed", available);
g_signal_emit_by_name (nm, "network-changed", available);
}
static void