From d1e07e2952ece84934cc5fd66baaf9e9a0e6c17c Mon Sep 17 00:00:00 2001 From: segfault Date: Mon, 9 Jul 2018 21:13:50 +0200 Subject: [PATCH 1/2] gtkmountoperation: Support TCRYPT options when using proxy handler GMountOperation now supports options to unlock TCRYPT volumes. This patch sets these options if they are returned by AskPassword() of a GtkMountOperationHandlerProxy. --- gtk/gtkmountoperation.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index 8ca5c55413..3a5e8d2893 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -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: From d073d5924b1823db70c27204d8f3d6aa96b9cf51 Mon Sep 17 00:00:00 2001 From: segfault Date: Sat, 21 Jul 2018 10:12:19 +0200 Subject: [PATCH 2/2] Bump glib required version to 2.57.2 --- configure.ac | 4 ++-- meson.build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9200972a9a..e650502049 100644 --- a/configure.ac +++ b/configure.ac @@ -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], diff --git a/meson.build b/meson.build index 0f818eedbd..fb23ae3c7e 100644 --- a/meson.build +++ b/meson.build @@ -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)