gio: Fix application of GNetworkMonitor:network-metered patch
authorPhilip Withnall <philip.withnall@collabora.co.uk>
Wed, 29 Jul 2015 10:56:41 +0000 (11:56 +0100)
committerPhilip Withnall <philip.withnall@collabora.co.uk>
Wed, 29 Jul 2015 10:58:02 +0000 (11:58 +0100)
commit6b652b1a2e7c6f67e9576e4331da76971d54cc68
tree0f8152a6f1bfa4c159c4933bbc87e3a863f874bd
parent7f195ac956153b06483bd0e78cfd3b5c100413b5
gio: Fix application of GNetworkMonitor:network-metered patch

The wrong patch from https://bugzilla.gnome.org/show_bug.cgi?id=750282
was applied, causing test failures due to not implementing the property
on GNetworkMonitorBase (plus some other omissions).

Fix that by reverting commit a80e7db1a8f26dc558085844dcb8003edb6eca74
and re-applying the correct patch over the top.

https://bugzilla.gnome.org/show_bug.cgi?id=750282
gio/gnetworkmonitor.c
gio/gnetworkmonitorbase.c
gio/gnetworkmonitornm.c
gio/tests/network-monitor.c