diff options
author | Philip Withnall <philip@tecnocode.co.uk> | 2018-09-03 12:14:18 +0000 |
---|---|---|
committer | Philip Withnall <philip@tecnocode.co.uk> | 2018-09-03 12:14:18 +0000 |
commit | 8f157d02749b8ba885cd2a61f82aa179ffb1e7c0 (patch) | |
tree | 5a416d81c72a6cb1187710677ab96aa1bc82bdc5 | |
parent | 6e03a05a9e7de892f8c1c44e70f43809c0fd7b4c (diff) | |
parent | 423a2936eaf438f5f55c33d02217c2a97bd59469 (diff) | |
download | glib-8f157d02749b8ba885cd2a61f82aa179ffb1e7c0.tar.gz |
Merge branch 'wip/fmuellner/nm-portal-changed-signal' into 'master'
portal network monitor: Always emit changed signal on changed
See merge request GNOME/glib!294
-rw-r--r-- | gio/gnetworkmonitorportal.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gio/gnetworkmonitorportal.c b/gio/gnetworkmonitorportal.c index 3c4c2f696..9a5820ab6 100644 --- a/gio/gnetworkmonitorportal.c +++ b/gio/gnetworkmonitorportal.c @@ -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 |