AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'gtk-3-24-support-tcrypt-with-proxy-handler' into 'gtk-3-24'

Browse Source 
gtkmountoperation: Support TCRYPT options when using proxy handler

See merge request GNOME/gtk!244
This commit is contained in:
Emmanuele Bassi 2019-07-18 10:46:43 +00:00
commit bae49dfeae
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -42,8 +42,8 @@ m4_define([gtk_binary_version], [3.0.0])
# required versions of other packages
m4_define([glib_required_major], [2])
m4_define([glib_required_minor], [53])
m4_define([glib_required_micro], [4])
m4_define([glib_required_minor], [57])
m4_define([glib_required_micro], [2])
m4_define([glib_required_version],
[glib_required_major.glib_required_minor.glib_required_micro])
m4_define([glib_min_required_minor],

6
gtk/gtkmountoperation.c
View File

@ -772,6 +772,12 @@ call_password_proxy_cb (GObject *source,
g_mount_operation_set_password (op, g_variant_get_string (value, NULL));
else if (strcmp (key, "password_save") == 0)
g_mount_operation_set_password_save (op, g_variant_get_uint32 (value));
else if (strcmp (key, "hidden_volume") == 0)
g_mount_operation_set_is_tcrypt_hidden_volume (op, g_variant_get_boolean (value));
else if (strcmp (key, "system_volume") == 0)
g_mount_operation_set_is_tcrypt_system_volume (op, g_variant_get_boolean (value));
else if (strcmp (key, "pim") == 0)
g_mount_operation_set_pim (op, g_variant_get_uint32 (value));
}
out:

4
meson.build
View File

@ -8,8 +8,8 @@ project('gtk+-3.0', 'c',
license: 'LGPLv2.1+')
glib_major_req = 2
glib_minor_req = 53
glib_micro_req = 4
glib_minor_req = 57
glib_micro_req = 2
if glib_minor_req.is_odd()
glib_min_required = 'GLIB_VERSION_@0@_@1@'.format(glib_major_req, glib_minor_req - 1)