fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 17:50:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: fix up bad merge

Browse source 
Fixes: 24a464a7da
This commit is contained in:
Lubomir Rintel 2015-01-12 16:40:48 +01:00
parent 6d5e62a387
commit c9002c041d
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/settings/nm-settings-connection.h
View file

@ -46,17 +46,11 @@ G_BEGIN_DECLS
#define NM_SETTINGS_CONNECTION_UPDATED_BY_USER "updated-by-user"
/* Properties */
<<<<<<< HEAD
#define NM_SETTINGS_CONNECTION_VISIBLE "visible"
#define NM_SETTINGS_CONNECTION_UNSAVED "unsaved"
#define NM_SETTINGS_CONNECTION_READY "ready"
#define NM_SETTINGS_CONNECTION_FLAGS "flags"
=======
#define NM_SETTINGS_CONNECTION_VISIBLE "visible"
#define NM_SETTINGS_CONNECTION_UNSAVED "unsaved"
#define NM_SETTINGS_CONNECTION_READY "ready"
#define NM_SETTINGS_CONNECTION_FLAGS "flags"
#define NM_SETTINGS_CONNECTION_FILENAME "filename"
>>>>>>> settings: add NMSettingsConnection:filename
/**

2
src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
View file

@ -156,7 +156,7 @@ nm_ifcfg_connection_check_devtimeout (NMIfcfgConnection *self)
ifname = nm_setting_connection_get_interface_name (s_con);
if (!ifname)
return;
devtimeout = devtimeout_from_file (nm_ifcfg_connection_get_path (self));
devtimeout = devtimeout_from_file (nm_settings_connection_get_filename (NM_SETTINGS_CONNECTION (self)));
if (!devtimeout)
return;