Skip to content

Add support for libnm 1.43 #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tintou merged 3 commits into from
Apr 24, 2023
Merged

Add support for libnm 1.43 #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a10ddb5
meson: Add version check
meisenzahl Apr 24, 2023
a09647c
Handle version
meisenzahl Apr 24, 2023
d046521
Apply suggestions from code review
meisenzahl Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Utils.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,18 @@ namespace Network {
public delegate void UpdateSecretCallback ();

public static void update_secrets (NM.RemoteConnection connection, UpdateSecretCallback callback) {
#if HAS_NM_1_43
connection.get_secrets_async.begin (NM.SettingWirelessSecurity.SETTING_NAME, null, (obj, res) => {
#else
connection.get_secrets_async.begin (NM.SettingWireless.SECURITY_SETTING_NAME, null, (obj, res) => {
#endif
try {
var secrets = connection.get_secrets_async.end (res);
#if HAS_NM_1_43
connection.update_secrets (NM.SettingWirelessSecurity.SETTING_NAME, secrets);
#else
connection.update_secrets (NM.SettingWireless.SECURITY_SETTING_NAME, secrets);
#endif
} catch (Error e) {
warning ("%s\n", e.message);
return;
Expand Down
10 changes: 9 additions & 1 deletion src/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ plug_files = files(
switchboard_dep = dependency('switchboard-2.0')
switchboard_plugsdir = switchboard_dep.get_pkgconfig_variable('plugsdir', define_variable: ['libdir', libdir])

libnm_dep = dependency('libnm', version: '>=1.20.6')

args = []
if libnm_dep.version().version_compare('>=1.43.3')
args += '--define=HAS_NM_1_43'
endif

shared_module(
meson.project_name(),
plug_files,
Expand All @@ -35,11 +42,12 @@ shared_module(
dependency('gobject-2.0'),
dependency('granite', version: '>=5.2.3'),
dependency('gtk+-3.0'),
dependency('libnm', version: '>=1.20.6'),
libnm_dep,
dependency('libnma'),
meson.get_compiler('vala').find_library('posix'),
switchboard_dep
],
vala_args: args,
install: true,
install_dir : join_paths(switchboard_plugsdir, 'network')
)