D17529: [proxysetting] Fix build with NM 1.4

This revision was automatically updated to reflect the committed changes. Closed by commit R282:88f3093c5237: [proxysetting] Fix build with NM 1.4 (authored by wbauer). REPOSITORY R282 NetworkManagerQt CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D17529?vs=47446=47454 REVISION

D17529: [proxysetting] Fix build with NM 1.4

jgrulich accepted this revision. This revision is now accepted and ready to land. REPOSITORY R282 NetworkManagerQt REVISION DETAIL https://phabricator.kde.org/D17529 To: wbauer, jgrulich Cc: kde-frameworks-devel, michaelh, ngraham, bruns

D17529: [proxysetting] Fix build with NM 1.4

wbauer edited the summary of this revision. REPOSITORY R282 NetworkManagerQt REVISION DETAIL https://phabricator.kde.org/D17529 To: wbauer, jgrulich Cc: kde-frameworks-devel, michaelh, ngraham, bruns

D17529: [proxysetting] Fix build with NM 1.4

wbauer requested review of this revision. REPOSITORY R282 NetworkManagerQt REVISION DETAIL https://phabricator.kde.org/D17529 To: wbauer, jgrulich Cc: kde-frameworks-devel, michaelh, ngraham, bruns

D17529: [proxysetting] Fix build with NM 1.4

wbauer updated this revision to Diff 47446. wbauer edited the summary of this revision. wbauer added a comment. Don't define the enum, rather use the numbers directly REPOSITORY R282 NetworkManagerQt CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D17529?vs=47426=47446 REVISION

D17529: [proxysetting] Fix build with NM 1.4

jgrulich added a comment. In D17529#375913 , @wbauer wrote: > In D17529#375909 , @jgrulich wrote: > > > So maybe go with the easiest approach and just instead of defines use 0 and 1? > > >

D17529: [proxysetting] Fix build with NM 1.4

wbauer added a comment. In D17529#375909 , @jgrulich wrote: > So maybe go with the easiest approach and just instead of defines use 0 and 1? Fine with me. Should I make that conditional depending on the NM version maybe, or just

D17529: [proxysetting] Fix build with NM 1.4

jgrulich added a comment. So maybe go with the easiest approach and just instead of defines use 0 and 1? REPOSITORY R282 NetworkManagerQt REVISION DETAIL https://phabricator.kde.org/D17529 To: wbauer, jgrulich Cc: kde-frameworks-devel, michaelh, ngraham, bruns

D17529: [proxysetting] Fix build with NM 1.4

wbauer added a comment. Hm, maybe I should add `extern "C"` though? This is inside `G_BEGIN_DECLS`/`G_END_DECLS` in nm-setting-proxy.h, which are defined as `extern "C" {` and `}` (according to the docs). REPOSITORY R282 NetworkManagerQt REVISION DETAIL

D17529: [proxysetting] Fix build with NM 1.4

wbauer added a comment. In D17529#375882 , @wbauer wrote: > I don't think that really is a problem here though, as it is defined in libnm/nm-setting-proxy.h (in NM 1.6+) which is included by this file (via NetworkManager.h that's included by

D17529: [proxysetting] Fix build with NM 1.4

jgrulich accepted this revision. This revision is now accepted and ready to land. REPOSITORY R282 NetworkManagerQt REVISION DETAIL https://phabricator.kde.org/D17529 To: wbauer, jgrulich Cc: kde-frameworks-devel, michaelh, ngraham, bruns

D17529: [proxysetting] Fix build with NM 1.4

wbauer added a comment. In D17529#375867 , @jgrulich wrote: > I think the easiest solution here is just to set 0 and 1 to the enum values, instead of NM defines. Sure, that would work as well. But IMHO the version check would make

D17529: [proxysetting] Fix build with NM 1.4

jgrulich added a comment. I think the easiest solution here is just to set 0 and 1 to the enum values, instead of NM defines. I'm not sure if adding/removing enum is ABI compatible change, because the enum will disapper once you build it against NM 1.6.0+. REPOSITORY R282 NetworkManagerQt

D17529: [proxysetting] Fix build with NM 1.4

wbauer added a reviewer: jgrulich. REPOSITORY R282 NetworkManagerQt REVISION DETAIL https://phabricator.kde.org/D17529 To: wbauer, jgrulich Cc: kde-frameworks-devel, michaelh, ngraham, bruns

D17529: [proxysetting] Fix build with NM 1.4

wbauer created this revision. Herald added a project: Frameworks. Herald added a subscriber: kde-frameworks-devel. wbauer requested review of this revision. REVISION SUMMARY The `NMSettingProxyMethod` enum only exists since NetworkManager 1.6. So define it appropriately when building with a