On Wed, 2018-01-17 at 16:07 +0000, John Emmas wrote:
On 17/01/2018 11:04, John Emmas wrote:I'll look a bit further into this and see if I can figure out what's gone wrong.This turned out to be a problem with TortoiseGit. Some of glib's python files contain lines looking like this:- from .whatever import something For some reason, I always need to edit them to remove the period - i.e. from whatever import something So typically, I can have 4 or 5 such conflicts in any given python script. TortoiseGit has an option which effectively means "resolve all conflicted lines using my version". But I've just realised that it doesn't confine itself to overwriting the conflicted lines - it actually substitutes my whole file (and therefore loses any non-conflicted changes!!)
Good to hear you’ve resolved that problem.
Now I'm past that point I've encountered a new problem (when compiling the recently added 'gnetworkmonitorwindows.c'). On my system (MSVC) it seems to be #including the wrong version of "iphlpapi.h" and is consequently failing to pick up one of the symbols (IP_ADDRESS_PREFIX) which is needed by function 'win_network_monitor_get_ip_info()'.
When you get a chance to investigate it, can you add your findings to https://bugzilla.gnome.org/show_bug.cgi?id=685442 please? That’s where we’re working on the Windows network monitor. Thanks, Philip
Attachment:
signature.asc
Description: This is a digitally signed message part