Differential D17317 Diff 46826 src/settings/setting.cpp

Changeset View

Standalone View

View Options

src/settings/setting.cpp

Context not available.
27 27​
28#include <QDebug> 28​#include <QDebug>
29 29​
30​#if !NM_CHECK_VERSION(1, 14, 0)
31​#define NM_SETTING_MATCH_SETTING_NAME "match"
32​#endif
33​
jgrulichUnsubmitted
Done

Same here, should be NM 1.14.0.

jgrulich: Same here, should be NM 1.14.0.
jgrulichUnsubmitted
Done

NM 1.14.0 is needed for NM_SETTING_MATCH_SETTING_NAME

jgrulich: NM 1.14.0 is needed for NM_SETTING_MATCH_SETTING_NAME
30#if !NM_CHECK_VERSION(1, 10, 0) 34​#if !NM_CHECK_VERSION(1, 10, 0)
35​#define NM_SETTING_TC_CONFIG_SETTING_NAME "tc"
31#define NM_SETTING_OVS_BRIDGE_SETTING_NAME "ovs-bridge" 36​#define NM_SETTING_OVS_BRIDGE_SETTING_NAME "ovs-bridge"
32#define NM_SETTING_OVS_INTERFACE_SETTING_NAME "ovs-interface" 37​#define NM_SETTING_OVS_INTERFACE_SETTING_NAME "ovs-interface"
33#define NM_SETTING_OVS_PATCH_SETTING_NAME "ovs-patch" 38​#define NM_SETTING_OVS_PATCH_SETTING_NAME "ovs-patch"
Context not available.
154 case OvsPort: 159​ case OvsPort:
155 typeString = QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME); 160​ typeString = QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME);
156 break; 161​ break;
162​ case Match:
163​ typeString = QLatin1String(NM_SETTING_MATCH_SETTING_NAME);
164​ break;
165​ case Tc:
166​ typeString = QLatin1String(NM_SETTING_TC_CONFIG_SETTING_NAME);
167​ break;
157 case NetworkManager::Setting::Generic: 168​ case NetworkManager::Setting::Generic:
158 typeString = QLatin1String(NM_SETTING_GENERIC_SETTING_NAME); 169​ typeString = QLatin1String(NM_SETTING_GENERIC_SETTING_NAME);
159 break; 170​ break;
Context not available.
224 type = OvsPatch; 235​ type = OvsPatch;
225 } else if (typeString == QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME)) { 236​ } else if (typeString == QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME)) {
226 type = OvsPort; 237​ type = OvsPort;
238​ } else if (typeString == QLatin1String(NM_SETTING_MATCH_SETTING_NAME)) {
239​ type = Match;
240​ } else if (typeString == QLatin1String(NM_SETTING_TC_CONFIG_SETTING_NAME)) {
241​ type = Tc;
227 } 242​ }
228 243​
229 return type; 244​ return type;
Context not available.