summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2020-07-22 11:47:52 +0200
committer Matteo Bernardini2021-02-27 09:48:52 +0100
commita98668c8867b2b8991047af85c80138439882f22 (patch)
tree15613383db09e44223feea48d4e4415a10a1fa8c
parent9aa1498acb0841d4ce656319a4de5cc157b4e2ed (diff)
downloadslackbuilds-gnomint.tar.gz
system/gnomint: Apply patches from debian.gnomint
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--system/gnomint/doinst.sh9
-rw-r--r--system/gnomint/gnomint.SlackBuild9
-rw-r--r--system/gnomint/patches/01-ldd.patch14
-rw-r--r--system/gnomint/patches/01_cflags.patch15
-rw-r--r--system/gnomint/patches/02-cflags.patch28
-rw-r--r--system/gnomint/patches/02_682432.patch16
-rw-r--r--system/gnomint/patches/03_fix-autoreconf.patch16
-rw-r--r--system/gnomint/patches/04_gsettings-port.patch383
-rw-r--r--system/gnomint/patches/05_export-private-key-crash.patch83
-rw-r--r--system/gnomint/patches/06_desktop-file.patch22
-rw-r--r--system/gnomint/patches/07_spelling-errors.patch39
-rw-r--r--system/gnomint/patches/08_gtk3-port.patch7655
-rw-r--r--system/gnomint/patches/09_gcc-10.patch33
-rw-r--r--system/gnomint/patches/gnutls3.patch31
14 files changed, 8271 insertions, 82 deletions
diff --git a/system/gnomint/doinst.sh b/system/gnomint/doinst.sh
index bae04666ba..6d1bccdc33 100644
--- a/system/gnomint/doinst.sh
+++ b/system/gnomint/doinst.sh
@@ -6,9 +6,8 @@ if [ -x /usr/bin/update-mime-database ]; then
/usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
-if [ -x usr/bin/gconftool-2 ]; then
- ( cd $PKG/etc/gconf/schemas
- GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
- usr/bin/gconftool-2 --makefile-install-rule \
- etc/gconf/schemas/gnomint.schemas >/dev/null 2>&1 )
+if [ -e usr/share/glib-2.0/schemas ]; then
+ if [ -x /usr/bin/glib-compile-schemas ]; then
+ /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+ fi
fi
diff --git a/system/gnomint/gnomint.SlackBuild b/system/gnomint/gnomint.SlackBuild
index 9f043f0c90..7a4f44ca82 100644
--- a/system/gnomint/gnomint.SlackBuild
+++ b/system/gnomint/gnomint.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for gnomint
-# Copyright 2012-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2012-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=gnomint
VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -71,9 +71,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-cp Makefile.in m4/
+# Apply debian patches
+for i in $CWD/patches/* ; do patch -p1 -i $i ; done
-sed -i 's|CFLAGS="-Wall -Werror "|CFLAGS="${CFLAGS:--Wall -Werror}"|' configure.ac configure
+autoreconf -fi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/gnomint/patches/01-ldd.patch b/system/gnomint/patches/01-ldd.patch
deleted file mode 100644
index 0f92419fb0..0000000000
--- a/system/gnomint/patches/01-ldd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description: Explicitly linking against libgcrypt.
-
-diff -Naurp gnomint.orig/src/Makefile.in gnomint/src/Makefile.in
---- gnomint.orig/src/Makefile.in 2011-05-17 19:57:50.013883380 +0200
-+++ gnomint/src/Makefile.in 2011-05-17 19:57:37.209981808 +0200
-@@ -347,6 +347,7 @@ gnomint_cli_SOURCES = \
-
- gnomint_cli_LDADD = \
- $(GNOMINTCLI_LIBS) \
-+ $(LIBGCRYPT_LIBS) \
- $(LIBGNUTLS_LIBS) \
- $(SQLITE_LIBS) \
- $(READLINE_LIBS) \
diff --git a/system/gnomint/patches/01_cflags.patch b/system/gnomint/patches/01_cflags.patch
new file mode 100644
index 0000000000..abf31b6357
--- /dev/null
+++ b/system/gnomint/patches/01_cflags.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description:
+ Don't hardcode CFLAGS and respect the environment (Closes: #634395).
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -182,7 +182,7 @@
+
+ dnl
+ if test "x$GCC" = "xyes"; then
+- CFLAGS="-Wall -Werror "
++ CFLAGS="${CFLAGS:--Wall}"
+ if test "x$use_debug" = "xYes"; then
+ CFLAGS="$CFLAGS -g -O0"
+ fi
diff --git a/system/gnomint/patches/02-cflags.patch b/system/gnomint/patches/02-cflags.patch
deleted file mode 100644
index 59e4f71943..0000000000
--- a/system/gnomint/patches/02-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description:
- Don't hardcode CFLAGS and respect the environemnt (Closes: #634395).
-
-diff -Naurp gnomint.orig/configure gnomint/configure
---- gnomint.orig/configure 2011-09-08 07:58:09.324752523 +0000
-+++ gnomint/configure 2011-09-08 07:59:20.113103539 +0000
-@@ -14338,7 +14338,7 @@ fi
-
-
- if test "x$GCC" = "xyes"; then
-- CFLAGS="-Wall -Werror"
-+ CFLAGS="${CFLAGS:--Wall -Werror}"
- if test "x$use_debug" = "xYes"; then
- CFLAGS="$CFLAGS -g -O0"
- fi
-diff -Naurp gnomint.orig/configure.in gnomint/configure.in
---- gnomint.orig/configure.in 2011-09-08 07:58:09.328752536 +0000
-+++ gnomint/configure.in 2011-09-08 07:59:20.113103539 +0000
-@@ -181,7 +181,7 @@ dnl
-
- dnl
- if test "x$GCC" = "xyes"; then
-- CFLAGS="-Wall -Werror"
-+ CFLAGS="${CFLAGS:--Wall -Werror}"
- if test "x$use_debug" = "xYes"; then
- CFLAGS="$CFLAGS -g -O0"
- fi
diff --git a/system/gnomint/patches/02_682432.patch b/system/gnomint/patches/02_682432.patch
new file mode 100644
index 0000000000..96905965a9
--- /dev/null
+++ b/system/gnomint/patches/02_682432.patch
@@ -0,0 +1,16 @@
+Description: Fix double free in tls_creation_data_free.
+Author: Sebastian Ramacher <s.ramacher@gmx.at>
+Bug-Debian: http://bugs.debian.org/682432
+Last-Update: 2012-08-04
+
+--- gnomint-1.3.0.orig/src/tls.c
++++ gnomint-1.3.0/src/tls.c
+@@ -1665,8 +1665,6 @@
+ g_free (cd->emailAddress);
+ if (cd->password)
+ g_free (cd->password);
+- if (cd->crl_distribution_point)
+- g_free (cd->crl_distribution_point);
+ if (cd->parent_ca_id_str)
+ g_free (cd->parent_ca_id_str);
+ if (cd->crl_distribution_point)
diff --git a/system/gnomint/patches/03_fix-autoreconf.patch b/system/gnomint/patches/03_fix-autoreconf.patch
new file mode 100644
index 0000000000..ee3a247889
--- /dev/null
+++ b/system/gnomint/patches/03_fix-autoreconf.patch
@@ -0,0 +1,16 @@
+Description: Fix autoreconf failure.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-01
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -198,7 +198,6 @@
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+-m4/Makefile
+ gui/Makefile
+ po/Makefile.in
+ mime/Makefile
diff --git a/system/gnomint/patches/04_gsettings-port.patch b/system/gnomint/patches/04_gsettings-port.patch
new file mode 100644
index 0000000000..5594012cd5
--- /dev/null
+++ b/system/gnomint/patches/04_gsettings-port.patch
@@ -0,0 +1,383 @@
+Description: Port to GSettings.
+Bug-Debian: https://bugs.debian.org/885817
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-15
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -61,7 +61,6 @@
+ GNUTLS_ADVANCED_FEATURES_MINIMUM_VERSION=2.7.4
+ SQLITE_REQUIRED=3.0
+ GLIB_REQUIRED=2.6.0
+-GCONF_REQUIRED=2.0
+ GTK_REQUIRED=2.12.0
+ ISO_CODES_REQUIRED=0.35
+
+@@ -84,7 +83,6 @@
+ PKG_CHECK_MODULES(GNOMINT,
+ glib-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 >= $GLIB_REQUIRED \
+- gconf-2.0 >= $GCONF_REQUIRED \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ gdk-pixbuf-2.0 \
+ gnutls >= $GNUTLS_REQUIRED \
+@@ -111,8 +109,7 @@
+ AC_SUBST(READLINE_LIBS)
+
+ PKG_CHECK_MODULES(GNOMINTCLI,
+- glib-2.0 >= $GLIB_REQUIRED \
+- gconf-2.0 >= $GCONF_REQUIRED \
++ gio-2.0 >= $GLIB_REQUIRED \
+ gnutls >= $GNUTLS_REQUIRED \
+ )
+ AC_SUBST(GNOMINTCLI_CFLAGS)
+@@ -150,17 +147,7 @@
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+ AC_SUBST(GLIB_GENMARSHAL)
+
+-dnl The following conditional is set in AM_GCONF_SOURCE_2.
+-dnl Because we may skip its execution, we have to set a default here.
+-m4_pattern_allow([^AM_GCONF_SOURCE_2$])
+-AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+-GCONFTOOL=""
+-AC_CHECK_PROG(GCONFTOOL, gconftool-2, gconftool-2)
+-if test x"$GCONFTOOL" = x; then
+- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+-fi
+-AM_GCONF_SOURCE_2
+-
++GLIB_GSETTINGS
+
+ dnl
+ dnl Check if src should be build with the debug mode
+--- gnomint-1.3.0.orig/gconf/Makefile.am
++++ gnomint-1.3.0/gconf/Makefile.am
+@@ -1,21 +1,5 @@
+-schemasdir = @GCONF_SCHEMA_FILE_DIR@
+-schemas_in_files = gnomint.schemas.in
+-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
++gsettings_SCHEMAS = net.sf.gnomint.gschema.xml
+
+-@INTLTOOL_SCHEMAS_RULE@
++@GSETTINGS_RULES@
+
+-EXTRA_DIST = $(schemas_in_files)
+-
+-CLEANFILES = $(schemas_DATA)
+-
+-if GCONF_SCHEMAS_INSTALL
+-# don't do this if we are building in eg. rpm
+-install-data-local: $(schemas_DATA)
+- if test -z "$(DESTDIR)" ; then \
+- for p in $(schemas_DATA) ; do \
+- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
+- done \
+- fi
+-else
+-install-data-local:
+-endif
++EXTRA_DIST = $(gsettings_SCHEMAS)
+--- gnomint-1.3.0.orig/src/preferences-gui.h
++++ gnomint-1.3.0/src/preferences-gui.h
+@@ -20,6 +20,8 @@
+ #ifndef _PREFERENCES_H_
+ #define _PREFERENCES_H_
+
++#include <gio/gio.h>
++
+ typedef void (* PreferencesGuiChangeCallback) (gboolean, gboolean);
+
+ void preferences_gui_set_csr_visible_callback (PreferencesGuiChangeCallback callback);
+@@ -43,10 +45,8 @@
+ void preferences_deinit (void);
+
+
+-#include <gconf/gconf-client.h>
+-void preferences_changed_callback(GConfClient* client,
+- guint cnxn_id,
+- GConfEntry *entry,
++void preferences_changed_callback(GSettings* settings,
++ gchar *key,
+ gpointer user_data);
+
+
+--- gnomint-1.3.0.orig/src/preferences-gui.c
++++ gnomint-1.3.0/src/preferences-gui.c
+@@ -18,7 +18,6 @@
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ #include <string.h>
+-#include <gconf/gconf-client.h>
+
+
+ #include "preferences-gui.h"
+@@ -26,7 +25,7 @@
+ #include <glib/gi18n.h>
+
+
+-static GConfClient * preferences_client;
++static GSettings * preferences;
+
+ PreferencesGuiChangeCallback csr_visible_callback = NULL;
+ PreferencesGuiChangeCallback revoked_visible_callback = NULL;
+@@ -42,18 +41,19 @@
+ }
+
+
+-void preferences_changed_callback(GConfClient* client,
+- guint cnxn_id,
+- GConfEntry *entry,
++void preferences_changed_callback(GSettings* settings,
++ gchar *key,
+ gpointer user_data)
+ {
+
+- gboolean value = gconf_value_get_bool (gconf_entry_get_value(entry));
+- if (! strcmp (gconf_entry_get_key(entry), "/apps/gnomint/crq_visible") && csr_visible_callback)
+- csr_visible_callback (value, TRUE);
+-
+- if (! strcmp (gconf_entry_get_key(entry), "/apps/gnomint/revoked_visible") && revoked_visible_callback)
+- revoked_visible_callback (value, TRUE);
++ if (! strcmp (key, "crq-visible") && csr_visible_callback)
++ csr_visible_callback (g_settings_get_boolean (settings, key),
++ TRUE);
++
++ if (! strcmp (key, "revoked-visible") && revoked_visible_callback)
++ revoked_visible_callback (g_settings_get_boolean
++ (settings, key),
++ TRUE);
+
+ }
+
+@@ -61,72 +61,62 @@
+
+ void preferences_init (int argc, char ** argv)
+ {
+- gconf_init(argc, argv, NULL);
+-
+- preferences_client = gconf_client_get_default();
+-
+- gconf_client_add_dir(preferences_client,
+- "/apps/gnomint",
+- GCONF_CLIENT_PRELOAD_NONE,
+- NULL);
+-
+- gconf_client_notify_add (preferences_client, "/apps/gnomint/revoked_visible",
+- preferences_changed_callback,
+- NULL, NULL, NULL);
+-
+- gconf_client_notify_add (preferences_client, "/apps/gnomint/crq_visible",
+- preferences_changed_callback,
+- NULL, NULL, NULL);
+-
++ preferences = g_settings_new ("net.sf.gnomint");
+
++ g_signal_connect (preferences, "changed",
++ G_CALLBACK (preferences_changed_callback), NULL);
+ }
+
+
+ gchar * preferences_get_size ()
+ {
+- return gconf_client_get_string (preferences_client, "/apps/gnomint/size", NULL);
++ return g_settings_get_string (preferences, "size");
+ }
+
+ void preferences_set_size (const gchar *new_value)
+ {
+- gconf_client_set_string (preferences_client, "/apps/gnomint/size", new_value, NULL);
++ g_settings_set_string (preferences, "size", new_value);
++ /* Make sure the backend manages to write the setting,
++ otherwise the program exits too quickly and a garbage value
++ gets written, leading to a crash on next startup. */
++ g_settings_sync ();
+ }
+
+
+ gboolean preferences_get_revoked_visible ()
+ {
+- return gconf_client_get_bool (preferences_client, "/apps/gnomint/revoked_visible", NULL);
++ return g_settings_get_boolean (preferences, "revoked-visible");
+ }
+
+ void preferences_set_revoked_visible (gboolean new_value)
+ {
+- gconf_client_set_bool (preferences_client, "/apps/gnomint/revoked_visible", new_value, NULL);
++ g_settings_set_boolean (preferences, "revoked-visible", new_value);
+ }
+
+ gboolean preferences_get_crq_visible ()
+ {
+- return gconf_client_get_bool (preferences_client, "/apps/gnomint/crq_visible", NULL);
++ return g_settings_get_boolean (preferences, "crq-visible");
+ }
+
+ void preferences_set_crq_visible (gboolean new_value)
+ {
+- gconf_client_set_bool (preferences_client, "/apps/gnomint/crq_visible", new_value, NULL);
++ g_settings_set_boolean (preferences, "crq-visible", new_value);
+ }
+
+ gboolean preferences_get_gnome_keyring_export ()
+ {
+- return gconf_client_get_bool (preferences_client, "/apps/gnomint/gnome_keyring_export", NULL);
++ return g_settings_get_boolean (preferences, "gnome-keyring-export");
+ }
+
+ void preferences_set_gnome_keyring_export (gboolean new_value)
+ {
+- gconf_client_set_bool (preferences_client, "/apps/gnomint/gnome_keyring_export", new_value, NULL);
++ g_settings_set_boolean (preferences, "gnome-keyring-export", new_value);
+ }
+
+
+ void preferences_deinit ()
+ {
+- g_object_unref (preferences_client);
+- preferences_client = NULL;
++ g_object_unref (preferences);
++ preferences = NULL;
+ }
+
+--- gnomint-1.3.0.orig/src/preferences.c
++++ gnomint-1.3.0/src/preferences.c
+@@ -18,36 +18,35 @@
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ #include <libintl.h>
+-#include <gconf/gconf-client.h>
++#include <gio/gio.h>
+
+ #include <glib/gi18n.h>
+
+ #include "preferences.h"
+
+
+-static GConfEngine * preferences_engine;
++static GSettings * preferences;
+
+ void preferences_init (int argc, char **argv)
+ {
+- gconf_init (argc, argv, NULL);
+- preferences_engine = gconf_engine_get_default ();
++ preferences = g_settings_new ("net.sf.gnomint");
+ }
+
+
+ gboolean preferences_get_gnome_keyring_export ()
+ {
+- return gconf_engine_get_bool (preferences_engine, "/apps/gnomint/gnome_keyring_export", NULL);
++ return g_settings_get_boolean (preferences, "gnome-keyring-export");
+ }
+
+ void preferences_set_gnome_keyring_export (gboolean new_value)
+ {
+- gconf_engine_set_bool (preferences_engine, "/apps/gnomint/gnome_keyring_export", new_value, NULL);
++ g_settings_set_boolean (preferences, "gnome-keyring-export", new_value);
+ }
+
+
+ void preferences_deinit ()
+ {
+- gconf_engine_unref (preferences_engine);
+- preferences_engine = NULL;
++ g_object_unref (preferences);
++ preferences = NULL;
+ }
+
+--- gnomint-1.3.0.orig/gconf/gnomint.schemas.in
++++ /dev/null
+@@ -1,58 +0,0 @@
+-<gconfschemafile>
+- <schemalist>
+- <schema>
+- <key>/schemas/apps/gnomint/size</key>
+- <applyto>/apps/gnomint/size</applyto>
+- <owner>gnomint</owner>
+- <type>string</type>
+- <default>(500,400)</default>
+- <locale name="C">
+- <short>Window size</short> <long>The (width,length) size
+- gnoMint should take when started. This cannot be smaller than
+- (320,200).
+- </long>
+- </locale>
+- </schema>
+-
+- <schema>
+- <key>/schemas/apps/gnomint/revoked_visible</key>
+- <applyto>/apps/gnomint/revoked_visible</applyto>
+- <owner>gnomint</owner>
+- <type>bool</type>
+- <default>0</default>
+- <locale name="C">
+- <short>Revoked certificates visibility</short>
+- <long>Whether the revoked certificates should be visible.
+- </long>
+- </locale>
+- </schema>
+-
+- <schema>
+- <key>/schemas/apps/gnomint/crq_visible</key>
+- <applyto>/apps/gnomint/crq_visible</applyto>
+- <owner>gnomint</owner>
+- <type>bool</type>
+- <default>1</default>
+- <locale name="C">
+- <short>Certificate requests visibility</short>
+- <long>Whether the certificate requests should be visible.
+- </long>
+- </locale>
+- </schema>
+-
+- <schema>
+- <key>/schemas/apps/gnomint/gnome_keyring_export</key>
+- <applyto>/apps/gnomint/gnome_keyring_export</applyto>
+- <owner>gnomint</owner>
+- <type>bool</type>
+- <default>1</default>
+- <locale name="C">
+- <short>Automatic exporting of certificates for gnome-keyring</short>
+- <long>Whether the created or imported certificates are
+- automatically exported to gnome-keyring certificate-store.
+- </long>
+- </locale>
+- </schema>
+-
+- </schemalist>
+-</gconfschemafile>
+--- /dev/null
++++ gnomint-1.3.0/gconf/net.sf.gnomint.gschema.xml
+@@ -0,0 +1,30 @@
++<schemalist gettext-domain="gnomint">
++ <schema id="net.sf.gnomint" path="/net/sf/gnomint/">
++ <key name="size" type="s">
++ <default>'(500,400)'</default>
++ <summary>Window size</summary>
++ <description>The (width,length) size gnoMint should take when
++ started. This cannot be smaller than (320,200).</description>
++ </key>
++ <key name="revoked-visible" type="b">
++ <default>false</default>
++ <summary>Revoked certificates visibility</summary>
++ <description>Whether the revoked certificates should be
++ visible.</description>
++ </key>
++ <key name="crq-visible" type="b">
++ <default>true</default>
++ <summary>Certificate requests visibility</summary>
++ <description>Whether the certificate requests should be
++ visible.</description>
++ </key>
++ <key name="gnome-keyring-export" type="b">
++ <default>true</default>
++ <summary>Automatic exporting of certificates for
++ gnome-keyring</summary>
++ <description>Whether the created or imported certificates are
++ automatically exported to gnome-keyring
++ certificate-store.</description>
++ </key>
++ </schema>
++</schemalist>
diff --git a/system/gnomint/patches/05_export-private-key-crash.patch b/system/gnomint/patches/05_export-private-key-crash.patch
new file mode 100644
index 0000000000..e0a3fd2bcb
--- /dev/null
+++ b/system/gnomint/patches/05_export-private-key-crash.patch
@@ -0,0 +1,83 @@
+Description: Fix crash when exporting the private key.
+ In ca_on_extractprivatekey1_activate, when calling
+ gtk_tree_model_get, GLib attempts to assign a guint64 value to a
+ variable declared gint (CA_MODEL_COLUMN_ID is defined as type
+ G_TYPE_UINT64 in the tree store). This corrupts the stack and also
+ invalidates the iter.
+ .
+ While investigating this, I noticed that the program happily leaks
+ GtkTreeIter's. Every time the user selects a certificate from the
+ tree view, the callback ca_treeview_selection_change invokes
+ __ca_selection_type which makes a copy of the iter with
+ gtk_tree_iter_copy. If the user chooses some action from the popup
+ menu, the toolbar or the main menu, __ca_selection_type is called
+ once again in the widget's callback function, copying another iter.
+ AFAICT these are never freed for the lifetime of the program.
+ .
+ This is not addressed by the patch as it would require some changes,
+ but it could be a source of trouble and something to watch out if
+ bugs like this pop up. According to the GTK+ API documentation,
+ gtk_tree_iter_copy is not supposed to be used by applications;
+ GtkTreeIter structs should be copied by value.
+Bug-Debian: https://bugs.debian.org/855200
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-02
+---
+
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -922,7 +922,7 @@
+ GObject *widget = NULL;
+ gchar * filename = NULL;
+ GtkDialog * dialog = NULL;
+- gint id;
++ guint64 id;
+ gchar * strerror = NULL;
+
+ widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+@@ -973,7 +973,7 @@
+ GObject *widget = NULL;
+ gchar * filename = NULL;
+ GtkDialog * dialog = NULL;
+- gint id;
++ guint64 id;
+ gchar * error_msg = NULL;
+
+ widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+@@ -1022,7 +1022,7 @@
+ GObject *widget = NULL;
+ gchar * filename = NULL;
+ GtkDialog * dialog = NULL;
+- gint id;
++ guint64 id;
+
+ gchar *error_msg = NULL;
+
+@@ -1181,7 +1181,7 @@
+ GtkTreeIter *iter;
+ gint type;
+ gchar *filename = NULL;
+- gint id;
++ guint64 id;
+
+ type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+
+@@ -1212,7 +1212,7 @@
+ GtkTreeIter *iter;
+ gint type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+ gint response = 0;
+- gint id = 0;
++ guint64 id = 0;
+
+ if (type == CA_FILE_ELEMENT_TYPE_CSR)
+ return;
+@@ -1267,7 +1267,7 @@
+ GtkTreeIter *iter;
+ gint type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+ gint response = 0;
+- gint id = 0;
++ guint64 id = 0;
+
+ if (type != CA_FILE_ELEMENT_TYPE_CSR)
+ return;
diff --git a/system/gnomint/patches/06_desktop-file.patch b/system/gnomint/patches/06_desktop-file.patch
new file mode 100644
index 0000000000..a6b73b084a
--- /dev/null
+++ b/system/gnomint/patches/06_desktop-file.patch
@@ -0,0 +1,22 @@
+Description: Add code to Exec key, remove Encoding key, add Keywords key.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-01
+---
+
+--- gnomint-1.3.0.orig/gui/gnomint.desktop.in
++++ gnomint-1.3.0/gui/gnomint.desktop.in
+@@ -2,11 +2,11 @@
+ _Name=gnoMint X.509 CA Manager
+ GenericName=gnoMint X.509 CA Manager
+ _Comment=Manage X.509 certificates and CAs, easily and graphically
+-Exec=gnomint
++_Keywords=certificate;x.509;encryption;
++Exec=gnomint %f
+ Terminal=false
+ Type=Application
+ Icon=gnomint
+ Categories=GNOME;Application;System;Security
+ MimeType=application/x-gnomint;
+ StartupNotify=true
+-Encoding=UTF-8
diff --git a/system/gnomint/patches/07_spelling-errors.patch b/system/gnomint/patches/07_spelling-errors.patch
new file mode 100644
index 0000000000..f0045bd61b
--- /dev/null
+++ b/system/gnomint/patches/07_spelling-errors.patch
@@ -0,0 +1,39 @@
+Description: Fix some spelling errors.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-12
+---
+
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -978,7 +978,7 @@
+
+ widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+
+- dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export uncrypted private key"),
++ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export unencrypted private key"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+--- gnomint-1.3.0.orig/src/country_table.c
++++ gnomint-1.3.0/src/country_table.c
+@@ -520,7 +520,7 @@
+ country_table[i++].code = "VU";
+ country_table[i].name = D_("Venezuela");
+ country_table[i++].code = "VE";
+- country_table[i].name = D_("Viet Nam");
++ country_table[i].name = D_("Vietnam");
+ country_table[i++].code = "VN";
+ country_table[i].name = D_("Virgin Islands, British");
+ country_table[i++].code = "VG";
+--- gnomint-1.3.0.orig/src/import.c
++++ gnomint-1.3.0/src/import.c
+@@ -82,7 +82,7 @@
+ printf (_("The whole selected file, or some of its elements, seems to\n"
+ "be cyphered using a password or passphrase. For importing\n"
+ "the file into gnoMint database, you must provide an \n"
+- "appropiate password.\n"));
++ "appropriate password.\n"));
+
+ prompt = g_strdup_printf (_("Please introduce password for `%s'"), crypted_part_description);
+ password = dialog_ask_for_password (prompt);
diff --git a/system/gnomint/patches/08_gtk3-port.patch b/system/gnomint/patches/08_gtk3-port.patch
new file mode 100644
index 0000000000..62638dd1df
--- /dev/null
+++ b/system/gnomint/patches/08_gtk3-port.patch
@@ -0,0 +1,7655 @@
+Description: Port to GTK 3.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-15
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -60,8 +60,8 @@
+ GNUTLS_REQUIRED=2.0
+ GNUTLS_ADVANCED_FEATURES_MINIMUM_VERSION=2.7.4
+ SQLITE_REQUIRED=3.0
+-GLIB_REQUIRED=2.6.0
+-GTK_REQUIRED=2.12.0
++GLIB_REQUIRED=2.41.1
++GTK_REQUIRED=3.21.5
+ ISO_CODES_REQUIRED=0.35
+
+
+@@ -83,7 +83,7 @@
+ PKG_CHECK_MODULES(GNOMINT,
+ glib-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 >= $GLIB_REQUIRED \
+- gtk+-2.0 >= $GTK_REQUIRED \
++ gtk+-3.0 >= $GTK_REQUIRED \
+ gdk-pixbuf-2.0 \
+ gnutls >= $GNUTLS_REQUIRED \
+ )
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -821,15 +821,15 @@
+ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export certificate"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+ else
+ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export certificate signing request"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -930,8 +930,8 @@
+ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export crypted private key"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -981,8 +981,8 @@
+ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export unencrypted private key"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -1032,8 +1032,8 @@
+ (_("Export whole certificate in PKCS#12 package"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -1422,8 +1422,8 @@
+ widget = gtk_builder_get_object (cert_popup_menu_gtkb, "revoke_menuitem");
+ gtk_widget_set_sensitive (GTK_WIDGET(widget), (! is_revoked));
+
+- gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL,
+- event_button->button, event_button->time);
++ gtk_menu_popup_at_pointer (GTK_MENU(menu),
++ (GdkEvent *)event_button);
+ return FALSE;
+ case CA_FILE_ELEMENT_TYPE_CSR:
+ menu = gtk_builder_get_object (csr_popup_menu_gtkb,
+@@ -1436,8 +1436,8 @@
+ widget = gtk_builder_get_object (csr_popup_menu_gtkb, "extract_pkey_menuitem3");
+ gtk_widget_set_sensitive (GTK_WIDGET(widget), pk_indb);
+
+- gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL,
+- event_button->button, event_button->time);
++ gtk_menu_popup_at_pointer (GTK_MENU(menu),
++ (GdkEvent *)event_button);
+ return FALSE;
+ default:
+ case -1:
+@@ -1446,13 +1446,6 @@
+
+ }
+
+-void ca_treeview_popup_timeout_program (GdkEventButton *event)
+-{
+- g_timeout_add (1, ca_treeview_popup_timeout_program_cb, event);
+-
+-}
+-
+-
+ G_MODULE_EXPORT gboolean ca_treeview_popup_handler (GtkTreeView *tree_view,
+ GdkEvent *event, gpointer user_data)
+ {
+@@ -1464,7 +1457,7 @@
+
+ event_button = (GdkEventButton *) event;
+ if (event_button->button == 3) {
+- ca_treeview_popup_timeout_program (event_button);
++ ca_treeview_popup_timeout_program_cb (event_button);
+ }
+ }
+
+@@ -1775,8 +1768,8 @@
+ dialog2 = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Save Diffie-Hellman parameters"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog2), TRUE);
+
+@@ -1871,8 +1864,8 @@
+ dialog = gtk_file_chooser_dialog_new (_("Select PEM file to import"),
+ GTK_WINDOW(main_window_widget),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+@@ -1905,8 +1898,8 @@
+ dialog = gtk_file_chooser_dialog_new (_("Select directory to import"),
+ GTK_WINDOW(main_window_widget),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+--- gnomint-1.3.0.orig/src/certificate_properties.c
++++ gnomint-1.3.0/src/certificate_properties.c
+@@ -242,7 +242,7 @@
+ for (i = g_list_length(cert->uses) - 1; i >= 0; i--) {
+ GtkLabel *label = NULL;
+ label = GTK_LABEL(gtk_label_new ((gchar *) g_list_nth_data (cert->uses, i)));
+- gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
++ gtk_label_set_xalign (label, 0.0);
+ gtk_box_pack_end (GTK_BOX(widget), GTK_WIDGET(label), 0, 0, 0);
+ }
+ gtk_widget_show_all (GTK_WIDGET(widget));
+--- gnomint-1.3.0.orig/src/creation_process_window.c
++++ gnomint-1.3.0/src/creation_process_window.c
+@@ -66,7 +66,7 @@
+ GtkWidget *dialog = NULL;
+
+ g_thread_join (creation_process_window_thread);
+- gtk_timeout_remove (timer);
++ g_source_remove (timer);
+ timer = 0;
+
+ widget = gtk_builder_get_object (creation_process_window_gtkb, "creation_process_window");
+@@ -116,7 +116,7 @@
+ creation_process_window_ca_finish ();
+ } else if (status < 0) {
+ error_message = (gchar *) g_thread_join (creation_process_window_thread);
+- gtk_timeout_remove (timer);
++ g_source_remove (timer);
+ timer = 0;
+ if (error_message) {
+ creation_process_window_error_dialog (error_message);
+@@ -165,7 +165,7 @@
+ GtkWidget *dialog, *widget;
+
+ if (timer) {
+- gtk_timeout_remove (timer);
++ g_source_remove (timer);
+ timer = 0;
+ }
+
+@@ -196,7 +196,7 @@
+ GtkWidget *widget = NULL, *dialog = NULL;
+
+ g_thread_join (creation_process_window_thread);
+- gtk_timeout_remove (timer);
++ g_source_remove (timer);
+ timer = 0;
+
+ widget = GTK_WIDGET(gtk_builder_get_object (creation_process_window_gtkb, "creation_process_window"));
+@@ -242,7 +242,7 @@
+ creation_process_window_csr_finish ();
+ } else if (status < 0) {
+ error_message = (gchar *) g_thread_join (creation_process_window_thread);
+- gtk_timeout_remove (timer);
++ g_source_remove (timer);
+ timer = 0;
+ if (error_message) {
+ creation_process_window_error_dialog (error_message);
+--- gnomint-1.3.0.orig/src/crl.c
++++ gnomint-1.3.0/src/crl.c
+@@ -213,7 +213,7 @@
+ G_MODULE_EXPORT void crl_cancel_clicked_cb (GtkButton *button, gpointer userdata)
+ {
+ GtkWidget * window = GTK_WIDGET(gtk_builder_get_object (crl_window_gtkb, "new_crl_dialog"));
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(window);
+
+ }
+
+@@ -241,8 +241,8 @@
+ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export Certificate Revocation List"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Save"), GTK_RESPONSE_ACCEPT,
+ NULL));
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -274,7 +274,7 @@
+ gtk_widget_destroy (GTK_WIDGET(dialog));
+
+ dialog = GTK_DIALOG(gtk_builder_get_object (crl_window_gtkb, "new_crl_dialog"));
+- gtk_object_destroy(GTK_OBJECT(dialog));
++ gtk_widget_destroy(GTK_WIDGET(dialog));
+
+ }
+
+--- gnomint-1.3.0.orig/src/main.c
++++ gnomint-1.3.0/src/main.c
+@@ -291,8 +291,8 @@
+ dialog = gtk_file_chooser_dialog_new (_("Create new CA database"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+
+@@ -363,8 +363,8 @@
+ dialog = gtk_file_chooser_dialog_new (_("Open CA database"),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+@@ -451,8 +451,8 @@
+ dialog = gtk_file_chooser_dialog_new (_("Save CA database as..."),
+ GTK_WINDOW(widget),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+
+@@ -490,14 +490,19 @@
+ {
+
+ GtkWidget *widget;
+- gchar *authors[2];
++ GdkPixbuf *logo;
++ gchar **authors;
++ gchar *file;
+
+ widget = GTK_WIDGET(gtk_builder_get_object (main_window_gtkb, "main_window"));
+
+- authors[0] = PACKAGE_AUTHORS;
+- authors[1] = NULL;
++ authors = g_strsplit (PACKAGE_AUTHORS, "\n", -1);
++ file = g_build_filename (PACKAGE_DATA_DIR, "gnomint",
++ "gnomint.png", NULL);
++ logo = gdk_pixbuf_new_from_file (file, NULL);
+
+ gtk_show_about_dialog (GTK_WINDOW(widget),
++ "logo", logo,
+ "version", PACKAGE_VERSION,
+ "copyright", PACKAGE_COPYRIGHT,
+ "comments", _("gnoMint is a program for creating and managing Certification Authorities, and their certificates"),
+@@ -507,4 +512,7 @@
+ "authors", authors,
+ "translator_credits", _("translator-credits"),
+ NULL);
++ g_object_unref (logo);
++ g_strfreev (authors);
++ g_free (file);
+ }
+--- gnomint-1.3.0.orig/src/new_ca_window.c
++++ gnomint-1.3.0/src/new_ca_window.c
+@@ -129,7 +129,7 @@
+
+ GtkWindow *window = GTK_WINDOW(gtk_builder_get_object (new_ca_window_gtkb, "new_ca_window"));
+
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(GTK_WIDGET(window));
+
+ }
+
+@@ -299,7 +299,7 @@
+ }
+
+ window = GTK_WINDOW(gtk_builder_get_object (new_ca_window_gtkb, "new_ca_window"));
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(GTK_WIDGET(window));
+
+ creation_process_window_ca_display (ca_creation_data);
+
+--- gnomint-1.3.0.orig/src/new_cert.c
++++ gnomint-1.3.0/src/new_cert.c
+@@ -456,7 +456,7 @@
+ gpointer user_data)
+ {
+ GtkWidget * window = GTK_WIDGET(gtk_builder_get_object (new_cert_window_gtkb, "new_cert_window"));
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(window);
+
+ }
+
+@@ -743,7 +743,7 @@
+ }
+
+ widget = G_OBJECT(gtk_builder_get_object (new_cert_window_gtkb, "new_cert_window"));
+- gtk_object_destroy(GTK_OBJECT(widget));
++ gtk_widget_destroy(GTK_WIDGET(widget));
+
+ dialog_refresh_list();
+
+--- gnomint-1.3.0.orig/src/new_req_window.c
++++ gnomint-1.3.0/src/new_req_window.c
+@@ -410,7 +410,7 @@
+
+ GtkWindow *window = GTK_WINDOW(gtk_builder_get_object (new_req_window_gtkb, "new_req_window"));
+
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(GTK_WIDGET(window));
+
+ }
+
+@@ -498,7 +498,7 @@
+ }
+
+ window = GTK_WINDOW(gtk_builder_get_object (new_req_window_gtkb, "new_req_window"));
+- gtk_object_destroy(GTK_OBJECT(window));
++ gtk_widget_destroy(GTK_WIDGET(window));
+
+ creation_process_window_csr_display (csr_creation_data);
+
+--- gnomint-1.3.0.orig/gui/certificate_popup_menu.ui
++++ gnomint-1.3.0/gui/certificate_popup_menu.ui
+@@ -1,45 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkMenu" id="certificate_popup_menu">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImageMenuItem" id="cert_properties_menuitem">
+ <property name="label">gtk-properties</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Shows the certificate properties window</property>
+ <property name="tooltip_text" translatable="yes">Shows the certificate properties window</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_properties1_activate"/>
++ <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="sep_menuitem5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="cert_export_menuitem">
+ <property name="label" translatable="yes">E_xport</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Exports the certificate so it can be imported by any other application</property>
+ <property name="tooltip_text" translatable="yes">Exports the certificate so it can be imported by any other application</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_export1_activate"/>
++ <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="extract_pkey_menuitem">
+ <property name="label" translatable="yes">Extrac_t private key</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Extracts the private key of the selected
+@@ -52,25 +57,27 @@
+ each time the certificate will be used</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++ <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="sep_menuitem6">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="revoke_menuitem">
+ <property name="label" translatable="yes">Revo_ke</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Revokes the selected certificate</property>
+ <property name="tooltip_text" translatable="yes">Revokes the selected certificate</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_revoke_activate"/>
++ <signal name="activate" handler="ca_on_revoke_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/certificate_properties_dialog.ui
++++ gnomint-1.3.0/gui/certificate_properties_dialog.ui
+@@ -1,547 +1,549 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
+- <object class="GtkAdjustment" id="AdjustmentHoursBetweenCRLUpdates">
+- <property name="value">24</property>
+- <property name="lower">1</property>
+- <property name="upper">8760</property>
+- <property name="step_increment">24</property>
+- <property name="page_increment">168</property>
+- </object>
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="AdjustmentCertMonthsBeforeExpiration">
+- <property name="value">60</property>
+ <property name="lower">1</property>
+ <property name="upper">600</property>
++ <property name="value">60</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">12</property>
+ </object>
++ <object class="GtkAdjustment" id="AdjustmentHoursBetweenCRLUpdates">
++ <property name="lower">1</property>
++ <property name="upper">8760</property>
++ <property name="value">24</property>
++ <property name="step_increment">24</property>
++ <property name="page_increment">168</property>
++ </object>
+ <object class="GtkWindow" id="certificate_properties_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Certificate properties - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <child>
+- <object class="GtkVBox" id="vbox4">
++ <placeholder/>
++ </child>
++ <child>
++ <object class="GtkBox" id="vbox4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkNotebook" id="notebook2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <child>
+- <object class="GtkVBox" id="vbox6">
++ <object class="GtkBox" id="vbox6">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkVBox" id="vboxCertCapabilities">
++ <object class="GtkBox" id="vboxCertCapabilities">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
++ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;This certificate has been verified for the following uses:&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHSeparator" id="certPropSeparator"/>
++ <object class="GtkSeparator" id="certPropSeparator">
++ <property name="can_focus">False</property>
++ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table6">
++ <object class="GtkGrid" id="table6">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+- <property name="n_rows">17</property>
+- <property name="n_columns">2</property>
+ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="md5Label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">MD5FINGERPRINT</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">MD5FINGERPRINT</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">14</property>
+- <property name="bottom_attach">15</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sha1Label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SHA1FINGERPRINT</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SHA1FINGERPRINT</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">13</property>
+- <property name="bottom_attach">14</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label22">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">12</property>
+- <property name="bottom_attach">13</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certExpirationDateLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CertExpirationDate</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CertExpirationDate</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">11</property>
+- <property name="bottom_attach">12</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certActivationDateLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CertActivationDate</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CertActivationDate</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">10</property>
+- <property name="bottom_attach">11</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label29">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">9</property>
+- <property name="bottom_attach">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certIssuerOULabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CAOU</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CAOU</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+- <property name="bottom_attach">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certIssuerOLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CAO</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CAO</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+- <property name="bottom_attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certIssuerCNLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CACN</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CACN</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+- <property name="bottom_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label33">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSNLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CertSN</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CertSN</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSubjectOULabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectOU</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectOU</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSubjectOLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectO</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectO</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSubjectCNLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectCN</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectCN</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label38">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label39">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">MD5 fingerprint</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">MD5 fingerprint</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">14</property>
+- <property name="bottom_attach">15</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label40">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SHA1 fingerprint</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SHA1 fingerprint</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">13</property>
+- <property name="bottom_attach">14</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label41">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Fingerprints&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">1</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">12</property>
+- <property name="bottom_attach">13</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_padding">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label42">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Expires on</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Expires on</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">11</property>
+- <property name="bottom_attach">12</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label43">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Activated on</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Activated on</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+- <property name="bottom_attach">11</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label44">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Validity&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">1</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+- <property name="bottom_attach">10</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_padding">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label45">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+- <property name="bottom_attach">9</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label73">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization (O)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization (O)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+- <property name="bottom_attach">8</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label74">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Common Name (CN)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Common Name (CN)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+- <property name="bottom_attach">7</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label75">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Emmited by&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">1</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_padding">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label76">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Serial number</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Serial number</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label77">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label78">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization (O)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization (O)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label79">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Common Name (CN)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Common Name (CN)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label80">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Certificate subject&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">1</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_padding">7</property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sha256Label">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">SHA256FINGERPRINT</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">char</property>
+ <property name="width_chars">60</property>
++ <property name="max_width_chars">60</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">15</property>
+- <property name="bottom_attach">16</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SHA256 fingerprint</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SHA256 fingerprint</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">15</property>
+- <property name="bottom_attach">16</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sha512Label">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">SHA512FINGERPRINT</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">char</property>
+ <property name="width_chars">60</property>
++ <property name="max_width_chars">60</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">16</property>
+- <property name="bottom_attach">17</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SHA512 fingerprint</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SHA512 fingerprint</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">16</property>
+- <property name="bottom_attach">17</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+-
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -550,59 +552,68 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label81">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">General</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">General</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox13">
++ <object class="GtkBox" id="vbox13">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
++ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label82">
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Certificate hierarchy&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview3">
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+- <property name="expand">False</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label83">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Certificate fields&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -610,18 +621,21 @@
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="certTreeView">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+@@ -633,9 +647,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label85">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Details</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Details</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+@@ -643,22 +658,30 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox19">
++ <object class="GtkBox" id="vbox19">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">5</property>
++ <property name="can_focus">False</property>
++ <property name="margin_start">5</property>
++ <property name="margin_end">5</property>
+ <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;
+-It is recommended that all the certificates generated by a CA share the same properties.
+-If you want to generate certificates with different properties, you should create a hierarchy of CAs, each one with its own policy for certificate generation.&lt;/i&gt;
++It is recommended that all the certificates generated by a CA
++share the same properties.
++If you want to generate certificates with different properties, you
++should create a hierarchy of CAs, each one with its own policy for
++certificate generation.&lt;/i&gt;
+ &lt;/small&gt;
+-Please, define the maximum set of properties for the certificates that this CA will be able to generate:
++Please, define the maximum set of properties for the
++certificates that this CA will be able to generate:
+ </property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -667,18 +690,23 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox6">
++ <object class="GtkBox" id="hbox6">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <child>
+ <object class="GtkLabel" id="label36">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Maximum number of months before
++expiration of the new generated certificates:</property>
++ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Maximum number of months before expiration of the new generated certificates:</property>
+- <property name="wrap">True</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -686,13 +714,15 @@
+ <object class="GtkSpinButton" id="months_before_expiration_spinbutton2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="adjustment">AdjustmentCertMonthsBeforeExpiration</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+- <signal name="value_changed" handler="ca_policy_expiration_spin_button_change"/>
++ <signal name="value-changed" handler="ca_policy_expiration_spin_button_change" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -709,20 +739,26 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkVBox" id="vbox1">
++ <object class="GtkBox" id="vbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkHBox" id="hbox7">
++ <object class="GtkBox" id="hbox7">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <child>
+ <object class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Hours between CRL updates:</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -730,32 +766,41 @@
+ <object class="GtkSpinButton" id="hours_between_crl_updates_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="adjustment">AdjustmentHoursBetweenCRLUpdates</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+- <signal name="value_changed" handler="ca_policy_crl_update_spin_button_change"/>
++ <signal name="value-changed" handler="ca_policy_crl_update_spin_button_change" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox2">
++ <object class="GtkBox" id="vbox2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">9</property>
++ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">CRL distribution URL:</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -763,8 +808,8 @@
+ <object class="GtkEntry" id="crl_distribution_point_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="ca_policy_crl_distribution_point_change"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="ca_policy_crl_distribution_point_change" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -774,6 +819,8 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -782,6 +829,7 @@
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;CRL Properties&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+@@ -799,11 +847,10 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkTable" id="table7">
++ <object class="GtkGrid" id="table7">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+- <property name="n_rows">5</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkCheckButton" id="country_inherited_check">
+ <property name="label" translatable="yes">Country</property>
+@@ -812,8 +859,12 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="state_inherited_check">
+@@ -823,16 +874,17 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox4">
++ <object class="GtkBox" id="hbox4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton" id="country_same_radiobutton">
+ <property name="label" translatable="yes">must be the same</property>
+@@ -842,9 +894,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">country_differ_radiobutton</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -859,18 +913,21 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox8">
++ <object class="GtkBox" id="hbox8">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton" id="state_same_radiobutton">
+ <property name="label" translatable="yes">must be the same</property>
+@@ -880,9 +937,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">state_differ_radiobutton</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -897,15 +956,15 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -916,11 +975,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -931,11 +990,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -946,16 +1005,17 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox24">
++ <object class="GtkBox" id="hbox24">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton" id="city_same_radiobutton">
+ <property name="label" translatable="yes">must be the same</property>
+@@ -965,9 +1025,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">city_differ_radiobutton</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -982,20 +1044,21 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox25">
++ <object class="GtkBox" id="hbox25">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton" id="organization_same_radiobutton">
+ <property name="label" translatable="yes">must be the same</property>
+@@ -1005,9 +1068,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">organization_differ_radiobutton</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -1022,20 +1087,21 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox27">
++ <object class="GtkBox" id="hbox27">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton" id="ou_same_radiobutton">
+ <property name="label" translatable="yes">must be the same</property>
+@@ -1045,9 +1111,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">ou_differ_radiobutton</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -1062,15 +1130,15 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ </object>
+@@ -1078,10 +1146,11 @@
+ <child type="label">
+ <object class="GtkLabel" id="label30">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Inherited fields from CA subject&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+@@ -1097,11 +1166,10 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkTable" id="table12">
++ <object class="GtkGrid" id="table12">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkCheckButton" id="ca_check2">
+ <property name="label" translatable="yes">Certification Authority</property>
+@@ -1110,8 +1178,12 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="non_repudiation_check2">
+@@ -1121,11 +1193,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+@@ -1137,13 +1209,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -1155,13 +1225,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -1173,11 +1241,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -1189,11 +1257,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -1204,22 +1272,21 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label111">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ </object>
+@@ -1227,10 +1294,11 @@
+ <child type="label">
+ <object class="GtkLabel" id="label86">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Uses of new generated certificates&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+@@ -1246,11 +1314,10 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkTable" id="table15">
++ <object class="GtkGrid" id="table15">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkCheckButton" id="email_protection_check2">
+ <property name="label" translatable="yes">Email protection</property>
+@@ -1260,13 +1327,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -1277,11 +1342,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+@@ -1293,11 +1358,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -1309,8 +1374,12 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="time_stamping_check2">
+@@ -1320,11 +1389,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -1335,11 +1404,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -1350,26 +1419,23 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++ <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label100">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ </object>
+@@ -1377,14 +1443,17 @@
+ <child type="label">
+ <object class="GtkLabel" id="label102">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Purposes of new generated certificates&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+@@ -1396,9 +1465,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label23">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CA Policy</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CA Policy</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+@@ -1407,12 +1477,15 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox2">
++ <object class="GtkButtonBox" id="hbuttonbox2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -1422,7 +1495,7 @@
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="certificate_properties_close_clicked"/>
++ <signal name="clicked" handler="certificate_properties_close_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -1433,6 +1506,7 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+--- gnomint-1.3.0.orig/gui/change_password_dialog.ui
++++ gnomint-1.3.0/gui/change_password_dialog.ui
+@@ -1,32 +1,81 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="change_password_dialog">
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Database password protection - gnoMint</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox14">
++ <object class="GtkBox" id="dialog-vbox14">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area14">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="ca_changepwd_cancel_button">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="ca_changepwd_commit_button">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkTable" id="table20">
++ <object class="GtkGrid" id="table20">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">20</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+- <property name="column_spacing">10</property>
+ <property name="row_spacing">10</property>
++ <property name="column_spacing">10</property>
++ <property name="column_homogeneous">True</property>
+ <child>
+- <object class="GtkHBox" id="hbox26">
++ <object class="GtkBox" id="hbox26">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="ca_changepwd_pwd_protect_yes_radiobutton">
+@@ -37,7 +86,7 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="ca_changepwd_pwd_protect_radiobutton_toggled"/>
++ <signal name="toggled" handler="ca_changepwd_pwd_protect_radiobutton_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -64,39 +113,22 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkLabel" id="label109">
+- <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="label" translatable="yes">Protect CA database private
+-keys with password:</property>
+- <property name="wrap">True</property>
+- </object>
+- <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ca_changepwd_label3">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Enter new password again
+ for confirmation:</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+@@ -105,14 +137,12 @@
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -121,46 +151,41 @@
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ca_changepwd_label2">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Please, enter new
+ password:</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ca_changepwd_label1">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Please, enter current
+ password:</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+- <property name="y_padding">15</property>
+ </packing>
+ </child>
+ <child>
+@@ -169,61 +194,34 @@
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area14">
+- <property name="visible">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="layout_style">end</property>
+ <child>
+- <object class="GtkButton" id="ca_changepwd_cancel_button">
+- <property name="label" translatable="yes">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="ca_changepwd_commit_button">
+- <property name="label" translatable="yes">gtk-ok</property>
++ <object class="GtkLabel" id="label109">
+ <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="use_stock">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Protect CA database private
++keys with password:</property>
++ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/creation_process_window.ui
++++ gnomint-1.3.0/gui/creation_process_window.ui
+@@ -1,40 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkWindow" id="creation_process_window">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Creating new CA - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <child>
+- <object class="GtkHBox" id="hbox5">
++ <placeholder/>
++ </child>
++ <child>
++ <object class="GtkBox" id="hbox5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label25">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox5">
++ <object class="GtkBox" id="vbox5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">9</property>
+ <property name="orientation">vertical</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="titleLabel">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Creating CA Root Certificate</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Creating CA Root Certificate</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -45,6 +55,7 @@
+ <child>
+ <object class="GtkLabel" id="status_message_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ </object>
+@@ -57,7 +68,7 @@
+ <child>
+ <object class="GtkProgressBar" id="creation_process_window_progressbar">
+ <property name="visible">True</property>
+- <property name="activity_mode">True</property>
++ <property name="can_focus">False</property>
+ <property name="pulse_step">0</property>
+ </object>
+ <packing>
+@@ -73,7 +84,7 @@
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_cancel_creation_process_clicked"/>
++ <signal name="clicked" handler="on_cancel_creation_process_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -84,17 +95,21 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label26">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+--- gnomint-1.3.0.orig/gui/csr_popup_menu.ui
++++ gnomint-1.3.0/gui/csr_popup_menu.ui
+@@ -1,45 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkMenu" id="csr_popup_menu">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImageMenuItem" id="csr_properties_menuitem">
+ <property name="label">gtk-properties</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Shows the CSR properties window</property>
+ <property name="tooltip_text" translatable="yes">Shows the CSR properties window</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_properties1_activate"/>
++ <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="sep_menuitem7">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="csr_export_menuitem">
+ <property name="label" translatable="yes">E_xport</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Exports the CSR so it can be imported by any other application</property>
+ <property name="tooltip_text" translatable="yes">Exports the CSR so it can be imported by any other application</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_export1_activate"/>
++ <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="extract_pkey_menuitem3">
+ <property name="label" translatable="yes">Extrac_t private key</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Extracts the private key of the selected
+@@ -52,32 +57,35 @@
+ each time the CSR will be used</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++ <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="sep_menuitem8">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="sign_csr_menuitem">
+ <property name="label" translatable="yes">_Sign</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_sign1_activate"/>
++ <signal name="activate" handler="ca_on_sign1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="csr_delete_menuitem">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="ca_on_delete2_activate"/>
++ <signal name="activate" handler="ca_on_delete2_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/csr_properties_dialog.ui
++++ gnomint-1.3.0/gui/csr_properties_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkWindow" id="csr_properties_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">CSR properties - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+@@ -10,170 +11,183 @@
+ <property name="type_hint">dialog</property>
+ <property name="urgency_hint">True</property>
+ <child>
+- <object class="GtkVBox" id="vbox21">
++ <placeholder/>
++ </child>
++ <child>
++ <object class="GtkBox" id="vbox21">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkNotebook" id="notebook4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+- <object class="GtkVBox" id="vbox22">
++ <object class="GtkBox" id="vbox22">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkVBox" id="vboxCertCapabilities2">
++ <object class="GtkBox" id="vboxCertCapabilities2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="privatekey_in_db_label">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="label" translatable="yes">&lt;b&gt;This Certificate Signing Request has its corresponding private key saved in the internal database.&lt;/b&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">&lt;b&gt;This Certificate Signing Request has its
++corresponding private key saved in the internal database.&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHSeparator" id="certPropSeparator2">
++ <object class="GtkSeparator" id="certPropSeparator2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table8">
++ <object class="GtkGrid" id="table8">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="certSubjectOULabel1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectOU</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectOU</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSubjectOLabel1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectO</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectO</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="certSubjectCNLabel1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">SubjectCN</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">SubjectCN</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label131">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label119">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organizational Unit (OU)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label118">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization (O)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization (O)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label117">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Common Name (CN)</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Common Name (CN)</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label116">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;CSR subject&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">1</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_padding">7</property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -185,9 +199,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label135">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">General</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">General</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+@@ -199,9 +214,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label139">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Details</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Details</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+@@ -210,12 +226,15 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox5">
++ <object class="GtkButtonBox" id="hbuttonbox5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -225,7 +244,7 @@
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="csr_properties_close_clicked"/>
++ <signal name="clicked" handler="csr_properties_close_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -235,6 +254,8 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+--- gnomint-1.3.0.orig/gui/dh_parameters_dialog.ui
++++ gnomint-1.3.0/gui/dh_parameters_dialog.ui
+@@ -1,68 +1,124 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="AdjustmentDHPrimeSizeSpinButton">
+ <property name="lower">1024</property>
+ <property name="upper">10240</property>
+- <property name="step-increment">1024</property>
+- <property name="page-increment">1024</property>
+- <property name="page-size">0</property>
+ <property name="value">1024</property>
++ <property name="step_increment">1024</property>
++ <property name="page_increment">1024</property>
+ </object>
+ <object class="GtkDialog" id="dh_parameters_dialog">
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">New Diffie-Hellman parameters - gnoMint</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox18">
++ <object class="GtkBox" id="dialog-vbox18">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area18">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button19">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="button18">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox9">
++ <object class="GtkBox" id="vbox9">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label47">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="label" translatable="yes">You are about to create and export a set of Diffie&#xB7;Hellman parameters into a PKCS#3 structure file.</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">You are about to create and export a set of
++Diffie·Hellman parameters into a PKCS#3 structure file.</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label48">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="xpad">8</property>
+- <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;PKCS#3 files containing Diffie&#xB7;Hellman parameters are used by some cryptographic
++ <property name="can_focus">False</property>
++ <property name="margin_start">8</property>
++ <property name="margin_end">8</property>
++ <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;PKCS#3 files containing Diffie·Hellman parameters are used by some cryptographic
+ applications for a secure interchange of their keys over insecure channels.&lt;/i&gt;&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">80</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label49">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Please, enter the prime size, in bits:</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -70,58 +126,23 @@
+ <object class="GtkSpinButton" id="dh_prime_size_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="adjustment">AdjustmentDHPrimeSizeSpinButton</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="padding">10</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area18">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button19">
+- <property name="label" translatable="yes">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="button18">
+- <property name="label" translatable="yes">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+ </object>
+ </child>
+ <action-widgets>
+--- gnomint-1.3.0.orig/gui/get_db_password_dialog.ui
++++ gnomint-1.3.0/gui/get_db_password_dialog.ui
+@@ -1,28 +1,73 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="get_db_password_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Enter password - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox13">
++ <object class="GtkBox" id="dialog-vbox13">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area13">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button11">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="cadb_password_dialog_ok_button">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox24">
++ <object class="GtkBox" id="vbox24">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">20</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="get_passwd_msg_label">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">This action requires using one or more private keys saved in the CA database.
+
+ Please insert the database password.</property>
+@@ -30,6 +75,8 @@
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">40</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -38,28 +85,35 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="pwd_hbox">
++ <object class="GtkBox" id="pwd_hbox">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImage" id="image16">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">dialog-password</property>
+- <property name="icon-size">6</property>
++ <property name="icon_size">6</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="password_message2">
+ <property name="visible">True</property>
+- <property name="xalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Password:</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">1</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -69,15 +123,19 @@
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -86,10 +144,9 @@
+ <property name="label" translatable="yes">Remember this password during this gnoMint session</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
++ <property name="focus_on_click">False</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="focus_on_click">False</property>
+- <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+@@ -100,46 +157,9 @@
+ </child>
+ </object>
+ <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area13">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button11">
+- <property name="label">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="cadb_password_dialog_ok_button">
+- <property name="label">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/get_password_dialog.ui
++++ gnomint-1.3.0/gui/get_password_dialog.ui
+@@ -1,53 +1,100 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="get_password_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Enter password - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox12">
++ <object class="GtkBox" id="dialog-vbox12">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area12">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button10">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="password_dialog_ok_button">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox17">
++ <object class="GtkBox" id="vbox17">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">11</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="info_message">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Please, enter password</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table3">
++ <object class="GtkGrid" id="table3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">30</property>
+- <property name="n_rows">2</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkEntry" id="confirm_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -55,85 +102,55 @@
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="activates_default">True</property>
+- <signal name="changed" handler="dialog_password_entry_changed_cb"/>
++ <signal name="changed" handler="dialog_password_entry_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="confirm_message">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Password (confirm):</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="password_message">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Password:</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area12">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button10">
+- <property name="label">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+ <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="password_dialog_ok_button">
+- <property name="label">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="sensitive">False</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/get_pkey_dialog.ui
++++ gnomint-1.3.0/gui/get_pkey_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="get_pkey_dialog">
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Choose private key file. gnoMint</property>
+@@ -10,32 +11,84 @@
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox20">
++ <object class="GtkBox" id="dialog-vbox20">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area20">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button15">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="button7">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="padding">4</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox18">
++ <object class="GtkBox" id="vbox18">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">20</property>
+ <child>
+ <object class="GtkLabel" id="label28">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+ <property name="label" translatable="yes">&lt;big&gt;Choose private key file&lt;/big&gt;
+
+-For doing the selected operation, you must provide the file where resides the private key corresponding to the certificate:</property>
++For doing the selected operation, you must provide the
++file where resides the private key corresponding to the
++certificate:</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="width_chars">40</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -46,24 +99,28 @@
+ <child>
+ <object class="GtkLabel" id="cert_dn_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Certificate DN</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label31">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+ <property name="label" translatable="yes">Please, choose the file:</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="width_chars">40</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -74,8 +131,9 @@
+ <child>
+ <object class="GtkFileChooserButton" id="pkey_filechooser">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <signal name="selection_changed" handler="pkey_manage_filechooser_file_set_cb"/>
++ <signal name="selection-changed" handler="pkey_manage_filechooser_file_set_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -101,53 +159,12 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="padding">10</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area20">
+- <property name="visible">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button15">
+- <property name="label" translatable="yes">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="button7">
+- <property name="label" translatable="yes">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="padding">4</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+ </object>
+ </child>
+ <action-widgets>
+--- gnomint-1.3.0.orig/gui/import_file_or_directory_dialog.ui
++++ gnomint-1.3.0/gui/import_file_or_directory_dialog.ui
+@@ -1,40 +1,91 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="import_file_or_directory_dialog">
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Import selection - gnoMint</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox15">
++ <object class="GtkBox" id="dialog-vbox15">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area15">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button24">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="button23">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox10">
++ <object class="GtkBox" id="vbox10">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">8</property>
+ <child>
+ <object class="GtkLabel" id="label53">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Please, choose the more suitable option for
++what you want to import:</property>
++ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Please, choose the more suitable option for what you want to import:</property>
+- <property name="wrap">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox11">
++ <object class="GtkBox" id="vbox11">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="importfile_radiobutton">
+@@ -47,21 +98,31 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label54">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
+- <property name="label" translatable="yes">&lt;i&gt;Import a single file, encoded in DER or PEM format, containing certificates, private keys (encrypted or plain), signing requests (CSRs), revocation lists (CRLs) or PKCS#12 packages.&lt;/i&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="margin_start">24</property>
++ <property name="margin_end">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
++ <property name="label" translatable="yes">&lt;i&gt;Import a single file, encoded in DER or PEM format, containing
++certificates, private keys (encrypted or plain), signing
++requests (CSRs), revocation lists (CRLs) or PKCS#12
++packages.&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -76,73 +137,45 @@
+ <property name="group">importfile_radiobutton</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label55">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
++ <property name="can_focus">False</property>
++ <property name="margin_start">24</property>
++ <property name="margin_end">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
+ <property name="label" translatable="yes">&lt;i&gt;Import a directory containing the structure of
+ a whole CA made with OpenSSL .&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area15">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button24">
+- <property name="label" translatable="yes">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="button23">
+- <property name="label" translatable="yes">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+ <property name="expand">False</property>
+- <property name="fill">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/import_password_dialog.ui
++++ gnomint-1.3.0/gui/import_password_dialog.ui
+@@ -1,35 +1,84 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="import_password_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Enter password - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox16">
++ <object class="GtkBox" id="dialog-vbox16">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area16">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button21">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="import_password_dialog_ok_button1">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox8">
++ <object class="GtkBox" id="vbox8">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">20</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="get_passwd_msg_label1">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="label" translatable="yes">The whole selected file, or some of its elements, seems to be cyphered using a password or passphrase.
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">The whole selected file, or some of its elements, seems to
++be cyphered using a password or passphrase.
+
+-For importing the file into gnoMint database, you must provide an appropiate password.</property>
++For importing the file into gnoMint database, you must
++provide an appropiate password.</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">40</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -40,54 +89,69 @@
+ <child>
+ <object class="GtkLabel" id="label52">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="ypad">8</property>
++ <property name="can_focus">False</property>
++ <property name="margin_top">8</property>
++ <property name="margin_bottom">8</property>
+ <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;The part that is being imported has the description:&lt;/i&gt;&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="import_crypted_part_description">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="xpad">15</property>
++ <property name="can_focus">False</property>
++ <property name="margin_left">15</property>
++ <property name="margin_right">15</property>
+ <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;#Description#&lt;/i&gt;&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="pwd_hbox1">
++ <object class="GtkBox" id="pwd_hbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImage" id="image17">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">dialog-password</property>
+- <property name="icon-size">6</property>
++ <property name="icon_size">6</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="password_message1">
+ <property name="visible">True</property>
+- <property name="xalign">1</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Password:</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">1</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -97,60 +161,27 @@
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="visibility">False</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="position">3</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area16">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button21">
+- <property name="label">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="import_password_dialog_ok_button1">
+- <property name="label">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+ <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
++ <property name="fill">True</property>
++ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+--- gnomint-1.3.0.orig/gui/main_window.ui
++++ gnomint-1.3.0/gui/main_window.ui
+@@ -1,51 +1,82 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
++ <object class="GtkImage" id="addcaimg">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="pixbuf">addca.png</property>
++ </object>
++ <object class="GtkImage" id="addcsrimg">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="pixbuf">addcsr.png</property>
++ </object>
++ <object class="GtkImage" id="extractpkeyimg">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="pixbuf">extractpkey.png</property>
++ </object>
++ <object class="GtkImage" id="signimg">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="pixbuf">sign.png</property>
++ </object>
+ <object class="GtkWindow" id="main_window1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">gnoMint</property>
+ <property name="role">gnoMint_main</property>
+ <property name="window_position">center</property>
+ <property name="default_width">400</property>
+ <property name="default_height">300</property>
+ <property name="icon">gnomint.png</property>
+- <signal name="delete_event" handler="on_main_window1_delete"/>
++ <signal name="delete-event" handler="on_main_window1_delete" swapped="no"/>
++ <child>
++ <placeholder/>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox1">
++ <object class="GtkBox" id="vbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkMenuBar" id="menubar1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="file1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Certificates</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="file1_menu1">
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="new1">
+ <property name="label" translatable="yes">_New certificate database</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_new1_activate"/>
++ <signal name="activate" handler="on_new1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="open1">
+ <property name="label" translatable="yes">_Open certificate database</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_open1_activate"/>
++ <signal name="activate" handler="on_open1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="openrecentsmenuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Open _recents</property>
+ <property name="use_underline">True</property>
+ </object>
+@@ -54,41 +85,47 @@
+ <object class="GtkImageMenuItem" id="save_as1">
+ <property name="label" translatable="yes">_Save certificate database as...</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_save_as1_activate"/>
++ <signal name="activate" handler="on_save_as1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="gtk-add">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="menu3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="new2">
+ <property name="label" translatable="yes">_Add self-signed CA</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_add_self_signed_ca_activate"/>
++ <signal name="activate" handler="on_add_self_signed_ca_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="new_certificate1">
+ <property name="label" translatable="yes">Add _Certificate Request</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_add_csr_activate"/>
++ <signal name="activate" handler="on_add_csr_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+@@ -100,12 +137,13 @@
+ <property name="label" translatable="yes">Extrac_t private key</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Extract the saved private key to an external file or device</property>
+ <property name="tooltip_text" translatable="yes">Extract the saved private key to an external file or device</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++ <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+@@ -113,9 +151,10 @@
+ <property name="label" translatable="yes">Revo_ke</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_revoke_activate"/>
++ <signal name="activate" handler="ca_on_revoke_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+@@ -123,9 +162,10 @@
+ <property name="label" translatable="yes">_Sign</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="ca_on_sign1_activate"/>
++ <signal name="activate" handler="ca_on_sign1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+@@ -133,91 +173,103 @@
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="ca_on_delete2_activate"/>
++ <signal name="activate" handler="ca_on_delete2_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="generate_crl_menuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Generate the current Certificate Revocation List</property>
+ <property name="tooltip_text" translatable="yes">Generate the current Certificate Revocation List</property>
+ <property name="label" translatable="yes">Generate _CRL</property>
+ <property name="use_underline">True</property>
+- <signal name="activate" handler="ca_generate_crl"/>
++ <signal name="activate" handler="ca_generate_crl" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="generate_dh_menuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Generate D_H parameters...</property>
+ <property name="use_underline">True</property>
+- <signal name="activate" handler="ca_generate_dh_param_show"/>
++ <signal name="activate" handler="ca_generate_dh_param_show" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="change_pwd_menuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Change database pass_word</property>
+ <property name="use_underline">True</property>
+- <signal name="activate" handler="ca_on_change_pwd_menuitem_activate"/>
++ <signal name="activate" handler="ca_on_change_pwd_menuitem_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator5">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="import1">
+ <property name="label" translatable="yes">_Import</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+- <signal name="activate" handler="on_import1_activate"/>
++ <signal name="activate" handler="on_import1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="export1">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">E_xport</property>
+ <property name="use_underline">True</property>
+- <signal name="activate" handler="ca_on_export1_activate"/>
++ <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="quit1">
+ <property name="label">gtk-quit</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_quit1_activate"/>
++ <signal name="activate" handler="on_quit1_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+@@ -227,31 +279,36 @@
+ <child>
+ <object class="GtkMenuItem" id="edit1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="edit1_menu1">
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="properties1">
+ <property name="label">gtk-properties</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_properties1_activate"/>
++ <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="preferences1">
+ <property name="label">gtk-preferences</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_preferences1_activate"/>
++ <signal name="activate" handler="on_preferences1_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+@@ -261,31 +318,35 @@
+ <child>
+ <object class="GtkMenuItem" id="menuitem1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">_View</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="menu1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkCheckMenuItem" id="csr_view_menuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Certificate _Signing Requests</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+- <signal name="toggled" handler="ca_csr_view_toggled"/>
++ <signal name="toggled" handler="ca_csr_view_toggled" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="revoked_view_menuitem">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">_Revoked Certificates</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+- <signal name="toggled" handler="ca_rcrt_view_toggled"/>
++ <signal name="toggled" handler="ca_rcrt_view_toggled" swapped="no"/>
+ </object>
+ </child>
+ </object>
+@@ -295,17 +356,20 @@
+ <child>
+ <object class="GtkMenuItem" id="help1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="help1_menu1">
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="about1">
+ <property name="label">gtk-about</property>
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+- <signal name="activate" handler="on_about1_activate"/>
++ <signal name="activate" handler="on_about1_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+@@ -322,14 +386,16 @@
+ <child>
+ <object class="GtkToolbar" id="toolbar1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolButton" id="toolbutton1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Create a new database</property>
+ <property name="tooltip_text" translatable="yes">Create a new database</property>
+ <property name="stock_id">gtk-new</property>
+- <signal name="clicked" handler="on_new1_activate"/>
++ <signal name="clicked" handler="on_new1_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -339,11 +405,12 @@
+ <child>
+ <object class="GtkToolButton" id="toolbutton2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Open an existing database</property>
+ <property name="tooltip_text" translatable="yes">Open an existing database</property>
+ <property name="stock_id">gtk-open</property>
+- <signal name="clicked" handler="on_open1_activate"/>
++ <signal name="clicked" handler="on_open1_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -353,6 +420,7 @@
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -362,12 +430,13 @@
+ <child>
+ <object class="GtkToolButton" id="addca_toolbutton">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Add an autosigned CA</property>
+ <property name="tooltip_text" translatable="yes">Add an autosigned CA</property>
+ <property name="label" translatable="yes">Add autosigned CA certificate</property>
+ <property name="icon_widget">addcaimg</property>
+- <signal name="clicked" handler="on_add_self_signed_ca_activate"/>
++ <signal name="clicked" handler="on_add_self_signed_ca_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -377,12 +446,13 @@
+ <child>
+ <object class="GtkToolButton" id="addcsr_toolbutton">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Add a new Certificate Signing Request</property>
+ <property name="tooltip_text" translatable="yes">Add a new Certificate Signing Request</property>
+ <property name="label" translatable="yes">Add CSR</property>
+ <property name="icon_widget">addcsrimg</property>
+- <signal name="clicked" handler="on_add_csr_activate"/>
++ <signal name="clicked" handler="on_add_csr_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -392,6 +462,7 @@
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton6">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -402,12 +473,13 @@
+ <object class="GtkToolButton" id="extractpkey_toolbutton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Extract the private key of the selected item into a external file</property>
+ <property name="tooltip_text" translatable="yes">Extract the private key of the selected item into a external file</property>
+ <property name="label" translatable="yes">Extract Private Key</property>
+ <property name="icon_widget">extractpkeyimg</property>
+- <signal name="clicked" handler="ca_on_extractprivatekey1_activate"/>
++ <signal name="clicked" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -418,12 +490,13 @@
+ <object class="GtkToolButton" id="revoke_toolbutton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Revoke the selected certificate</property>
+ <property name="tooltip_text" translatable="yes">Revoke the selected certificate</property>
+ <property name="label" translatable="yes">Revoke</property>
+ <property name="stock_id">gtk-cancel</property>
+- <signal name="clicked" handler="ca_on_revoke_activate"/>
++ <signal name="clicked" handler="ca_on_revoke_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -434,12 +507,13 @@
+ <object class="GtkToolButton" id="sign_toolbutton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Sign the selected Certificate Signing Request</property>
+ <property name="tooltip_text" translatable="yes">Sign the selected Certificate Signing Request</property>
+ <property name="label" translatable="yes">Sign</property>
+ <property name="icon_widget">signimg</property>
+- <signal name="clicked" handler="ca_on_sign1_activate"/>
++ <signal name="clicked" handler="ca_on_sign1_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -450,11 +524,12 @@
+ <object class="GtkToolButton" id="delete_toolbutton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
++ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup">Delete the selected Certificate Signing Request</property>
+ <property name="tooltip_text" translatable="yes">Delete the selected Certificate Signing Request</property>
+ <property name="stock_id">gtk-delete</property>
+- <signal name="clicked" handler="ca_on_delete2_activate"/>
++ <signal name="clicked" handler="ca_on_delete2_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -472,41 +547,28 @@
+ <object class="GtkScrolledWindow" id="scrolledwindow6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="ca_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="rules_hint">True</property>
+- <signal name="button_press_event" handler="ca_treeview_popup_handler"/>
+- <signal name="cursor_changed" handler="ca_treeview_selection_change"/>
+- <signal name="row_activated" handler="ca_treeview_row_activated"/>
++ <signal name="button-press-event" handler="ca_treeview_popup_handler" swapped="no"/>
++ <signal name="cursor-changed" handler="ca_treeview_selection_change" swapped="no"/>
++ <signal name="row-activated" handler="ca_treeview_row_activated" swapped="no"/>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+- <object class="GtkImage" id="addcaimg">
+- <property name="visible">True</property>
+- <property name="pixbuf">addca.png</property>
+- </object>
+- <object class="GtkImage" id="addcsrimg">
+- <property name="visible">True</property>
+- <property name="pixbuf">addcsr.png</property>
+- </object>
+- <object class="GtkImage" id="signimg">
+- <property name="visible">True</property>
+- <property name="pixbuf">sign.png</property>
+- </object>
+- <object class="GtkImage" id="extractpkeyimg">
+- <property name="visible">True</property>
+- <property name="pixbuf">extractpkey.png</property>
+- </object>
+ </interface>
+--- gnomint-1.3.0.orig/gui/new_ca_window.ui
++++ gnomint-1.3.0/gui/new_ca_window.ui
+@@ -1,49 +1,58 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <!-- interface-requires gtk+ 2.12 -->
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="adjustmentCAKeyLength">
+- <property name="value">2048</property>
+ <property name="lower">1024</property>
+ <property name="upper">5120</property>
++ <property name="value">2048</property>
+ <property name="step_increment">1024</property>
+ <property name="page_increment">1024</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustmentMonthsBeforeExpiration">
+- <property name="value">240</property>
+ <property name="lower">1</property>
+ <property name="upper">600</property>
++ <property name="value">240</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">12</property>
+ </object>
+ <object class="GtkWindow" id="new_ca_window">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">New CA - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <child>
++ <placeholder/>
++ </child>
++ <child>
+ <object class="GtkNotebook" id="new_ca_notebook">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+- <object class="GtkVBox" id="vbox2">
++ <object class="GtkBox" id="vbox2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+- <object class="GtkHBox" id="hbox1">
++ <object class="GtkBox" id="hbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;CA Subject Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -54,9 +63,10 @@
+ <child>
+ <object class="GtkLabel" id="label12">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -72,186 +82,168 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table1">
++ <object class="GtkGrid" id="table1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+- <property name="n_rows">6</property>
+- <property name="n_columns">2</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization Unit:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization Unit:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Country:</property>
+ <property name="max_width_chars">0</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">State or Province name: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">State or Province name: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">City: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">City: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="st_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="city_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="o_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="ou_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">CA Root Certificate
+ Common Name (CN):</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="cn_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="on_cn_entry_changed"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="on_cn_entry_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="country_combobox">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox1">
++ <object class="GtkButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -277,7 +269,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -294,7 +286,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_next1_clicked"/>
++ <signal name="clicked" handler="on_new_ca_next1_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -317,28 +309,33 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CA properties</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CA properties</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox20">
++ <object class="GtkBox" id="vbox20">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkHBox" id="hbox21">
++ <object class="GtkBox" id="hbox21">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label37">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;CA Root certificate properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -349,9 +346,10 @@
+ <child>
+ <object class="GtkLabel" id="label103">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -362,16 +360,16 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table2">
++ <object class="GtkGrid" id="table2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+- <property name="n_rows">3</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">True</property>
++ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkSpinButton" id="months_before_expiration_spinbutton">
+ <property name="visible">True</property>
+@@ -384,24 +382,20 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label27">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Months before root certificate expiration:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Months before root certificate expiration:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+@@ -416,15 +410,13 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox3">
++ <object class="GtkBox" id="hbox3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="rsa_radiobutton">
+@@ -435,7 +427,7 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_ca_privkey_type_toggle"/>
++ <signal name="toggled" handler="on_new_ca_privkey_type_toggle" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -462,45 +454,46 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label21">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Private key bit length:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Private key bit length:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label17">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Private key type:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Private key type:</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox12">
++ <object class="GtkButtonBox" id="hbuttonbox12">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -526,7 +519,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -542,7 +535,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_previous2_clicked"/>
++ <signal name="clicked" handler="on_new_ca_previous2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -558,7 +551,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_next2_clicked"/>
++ <signal name="clicked" handler="on_new_ca_next2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -569,20 +562,23 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
++ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Root certificate prop</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Root certificate prop</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+@@ -590,19 +586,23 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox3">
++ <object class="GtkBox" id="vbox3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkHBox" id="hbox2">
++ <object class="GtkBox" id="hbox2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;CA properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -613,9 +613,10 @@
+ <child>
+ <object class="GtkLabel" id="label14">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -626,17 +627,21 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox1">
++ <object class="GtkBox" id="vbox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">CRL Distribution Point:</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -647,8 +652,7 @@
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;small&gt;Please, in this field enter an URL where the CRL for this CA will be available.
+ You can leave it blank. In this case, no CRL Distribution Point will be set in the CA
+ Certificate, and you will be able to set it as a new CA property.
+@@ -657,6 +661,8 @@
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">60</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -668,7 +674,7 @@
+ <object class="GtkEntry" id="crl_distribution_point_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -678,12 +684,15 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox4">
++ <object class="GtkButtonBox" id="hbuttonbox4">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -709,7 +718,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -725,7 +734,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_previous3_clicked"/>
++ <signal name="clicked" handler="on_new_ca_previous3_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -741,7 +750,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_ca_commit_clicked"/>
++ <signal name="clicked" handler="on_new_ca_commit_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -752,17 +761,20 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
++ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label18">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Password protect</property>
+ </object>
+--- gnomint-1.3.0.orig/gui/new_cert_window.ui
++++ gnomint-1.3.0/gui/new_cert_window.ui
+@@ -1,41 +1,47 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="AdjustmentMonthsBeforeExpirationSpinButton1">
+ <property name="lower">1</property>
+ <property name="upper">600</property>
+- <property name="step-increment">1</property>
+- <property name="page-increment">12</property>
+- <property name="page-size">0</property>
+ <property name="value">1</property>
++ <property name="step_increment">1</property>
++ <property name="page_increment">12</property>
+ </object>
+ <object class="GtkWindow" id="new_cert_window">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">New Certificate - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <child>
++ <placeholder/>
++ </child>
++ <child>
+ <object class="GtkNotebook" id="new_cert_notebook">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+- <object class="GtkVBox" id="vbox25">
++ <object class="GtkBox" id="vbox25">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label136">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -46,197 +52,196 @@
+ <child>
+ <object class="GtkLabel" id="label137">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="label" translatable="yes">You are about to sign a Certificate Signing Request, and this way, creating a new certificate. Please check the certificate properties.</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">You are about to sign a Certificate Signing Request,
++and this way, creating a new certificate. Please
++check the certificate properties.</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table13">
++ <object class="GtkGrid" id="table13">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">16</property>
+- <property name="n_rows">6</property>
+- <property name="n_columns">2</property>
+- <property name="column_spacing">10</property>
+ <property name="row_spacing">6</property>
++ <property name="column_spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="cn_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ou_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="o_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="l_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="st_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="c_label">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">label</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label144">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label143">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization Unit:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization Unit:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label142">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Country:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Country:</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label141">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">State or Province name: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">State or Province name: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label140">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">City: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">City: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label138">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">New certificate
+ Common Name (CN):</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox14">
++ <object class="GtkButtonBox" id="hbuttonbox14">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -262,7 +267,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -278,7 +283,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_next1_clicked"/>
++ <signal name="clicked" handler="on_new_cert_next1_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -301,27 +306,30 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label145">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CA properties</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CA properties</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox23">
++ <object class="GtkBox" id="vbox23">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -332,13 +340,18 @@
+ <child>
+ <object class="GtkLabel" id="label84">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="label" translatable="yes">You are about to sign a Certificate Signing Request. Please, choose the Certification Authority you are going to use for signing it.</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">You are about to sign a Certificate Signing Request.
++Please, choose the Certification Authority you are
++going to use for signing it.</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -346,25 +359,29 @@
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="signing_ca_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+- <signal name="cursor_changed" handler="new_cert_signing_ca_treeview_cursor_changed"/>
++ <signal name="cursor-changed" handler="new_cert_signing_ca_treeview_cursor_changed" swapped="no"/>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox3">
++ <object class="GtkButtonBox" id="hbuttonbox3">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -390,7 +407,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -406,7 +423,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_previous2_clicked"/>
++ <signal name="clicked" handler="on_new_cert_previous2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -423,7 +440,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_next2_clicked"/>
++ <signal name="clicked" handler="on_new_cert_next2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -446,9 +463,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label151">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Choose CA for signing the CSR</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Choose CA for signing the CSR</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+@@ -456,17 +474,19 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox26">
++ <object class="GtkBox" id="vbox26">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label146">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -475,17 +495,21 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox20">
++ <object class="GtkBox" id="hbox20">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <child>
+ <object class="GtkLabel" id="label147">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Months before certificate expiration:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Months before certificate expiration:</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -493,19 +517,21 @@
+ <object class="GtkSpinButton" id="months_before_expiration_spinbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="adjustment">AdjustmentMonthsBeforeExpirationSpinButton1</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="fill">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -515,11 +541,10 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkTable" id="table16">
++ <object class="GtkGrid" id="table16">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkCheckButton" id="data_encipherment_check">
+ <property name="label" translatable="yes">Data encipherment</property>
+@@ -529,13 +554,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -547,13 +570,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -565,11 +586,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+@@ -580,8 +601,12 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="key_agreement_check">
+@@ -592,11 +617,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -607,11 +632,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -622,22 +647,21 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label110">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ </object>
+@@ -645,16 +669,17 @@
+ <child type="label">
+ <object class="GtkLabel" id="label150">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Certificate uses&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -664,22 +689,20 @@
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+- <object class="GtkTable" id="table14">
++ <object class="GtkGrid" id="table14">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+- <property name="n_rows">4</property>
+- <property name="n_columns">2</property>
+ <child>
+ <object class="GtkLabel" id="label161">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -690,13 +713,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -707,11 +728,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+@@ -722,11 +743,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+@@ -738,8 +759,12 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
++ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="webclient_check">
+@@ -750,11 +775,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+@@ -765,11 +790,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+@@ -781,13 +806,11 @@
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="on_new_cert_property_toggled"/>
++ <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ </object>
+@@ -795,30 +818,36 @@
+ <child type="label">
+ <object class="GtkLabel" id="label148">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Certificate purposes&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHSeparator" id="hseparator1">
++ <object class="GtkSeparator" id="hseparator1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="padding">10</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox15">
++ <object class="GtkButtonBox" id="hbuttonbox15">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -844,7 +873,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -860,7 +889,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_previous3_clicked"/>
++ <signal name="clicked" handler="on_new_cert_previous3_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -876,7 +905,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_cert_commit_clicked"/>
++ <signal name="clicked" handler="on_new_cert_commit_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -887,6 +916,7 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+@@ -898,6 +928,7 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label32">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Certificate properties</property>
+ </object>
+ <packing>
+--- gnomint-1.3.0.orig/gui/new_crl_dialog.ui
++++ gnomint-1.3.0/gui/new_crl_dialog.ui
+@@ -1,26 +1,75 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="new_crl_dialog">
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">New CRL - gnoMint</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox21">
++ <object class="GtkBox" id="dialog-vbox21">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">11</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area21">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button22">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="crl_cancel_clicked_cb" swapped="no"/>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="crl_ok_button">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="crl_ok_clicked_cb" swapped="no"/>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+ <object class="GtkLabel" id="label50">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;New Certificate Revocation List&lt;/b&gt;&lt;/big&gt;</property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -31,9 +80,10 @@
+ <child>
+ <object class="GtkLabel" id="label51">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Please, select the CA for which a Certificate
+ Revocation List is going to be created:</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -45,64 +95,25 @@
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="crl_ca_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+- <signal name="cursor_changed" handler="crl_treeview_cursor_changed_cb"/>
++ <signal name="cursor-changed" handler="crl_treeview_cursor_changed_cb" swapped="no"/>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area21">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button22">
+- <property name="label" translatable="yes">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- <signal name="clicked" handler="crl_cancel_clicked_cb"/>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="crl_ok_button">
+- <property name="label" translatable="yes">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="sensitive">False</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- <signal name="clicked" handler="crl_ok_clicked_cb"/>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+ </object>
+ </child>
+ <action-widgets>
+--- gnomint-1.3.0.orig/gui/new_req_window.ui
++++ gnomint-1.3.0/gui/new_req_window.ui
+@@ -1,41 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkAdjustment" id="AdjustmentKeyLengthSpinButton1">
+- <property name="value">2048</property>
+ <property name="lower">1024</property>
+ <property name="upper">5120</property>
++ <property name="value">2048</property>
+ <property name="step_increment">1024</property>
+ </object>
+ <object class="GtkWindow" id="new_req_window">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">New certificate request - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <child>
++ <placeholder/>
++ </child>
++ <child>
+ <object class="GtkNotebook" id="new_req_notebook">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+- <object class="GtkVBox" id="vbox27">
++ <object class="GtkBox" id="vbox27">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <property name="spacing">7</property>
+ <child>
+- <object class="GtkHBox" id="hbox22">
++ <object class="GtkBox" id="hbox22">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label105">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -46,9 +55,10 @@
+ <child>
+ <object class="GtkLabel" id="label106">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -59,18 +69,26 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label108">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="label" translatable="yes">&lt;small&gt;The subject of the new certificate request can inherit information from one of the existing Certification Authorities. This is a must if the policy of the CA you are going to use is defined to force some fields of a certificate subject to be the same as the ones in the CA cert subject.&lt;/small&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">&lt;small&gt;The subject of the new certificate request can inherit information
++from one of the existing Certification Authorities. This is a must if the
++policy of the CA you are going to use is defined to force some fields
++of a certificate subject to be the same as the ones in the CA cert
++subject.&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -84,6 +102,8 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -95,9 +115,11 @@
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">dont_inherit_radiobutton</property>
+- <signal name="toggled" handler="new_req_inherit_fields_toggled"/>
++ <signal name="toggled" handler="new_req_inherit_fields_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+@@ -105,8 +127,6 @@
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="hscrollbar_policy">automatic</property>
+- <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="new_req_ca_treeview">
+@@ -114,16 +134,22 @@
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="enable_tree_lines">True</property>
++ <child internal-child="selection">
++ <object class="GtkTreeSelection"/>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox13">
++ <object class="GtkButtonBox" id="hbuttonbox13">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -149,7 +175,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -165,7 +191,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_next1_clicked"/>
++ <signal name="clicked" handler="on_new_req_next1_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -176,6 +202,7 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+@@ -184,29 +211,34 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label95">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">CA properties</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">CA properties</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox15">
++ <object class="GtkBox" id="vbox15">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+- <object class="GtkHBox" id="hbox17">
++ <object class="GtkBox" id="hbox17">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label87">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -217,9 +249,10 @@
+ <child>
+ <object class="GtkLabel" id="label88">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -235,185 +268,167 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table9">
++ <object class="GtkGrid" id="table9">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+- <property name="n_rows">6</property>
+- <property name="n_columns">2</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="country_combobox1">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="cn_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
+- <signal name="changed" handler="on_new_req_cn_entry_changed"/>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="on_new_req_cn_entry_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label94">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Certificate
+ Common Name (CN):</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+- <property name="bottom_attach">6</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="ou_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="o_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="city_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="st_entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label93">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">City: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">City: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+- <property name="bottom_attach">3</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label92">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">State or Province name: </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">State or Province name: </property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label91">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Country:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Country:</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label90">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization Unit:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization Unit:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+- <property name="bottom_attach">5</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label89">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Organization:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Organization:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox10">
++ <object class="GtkButtonBox" id="hbuttonbox10">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -439,7 +454,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -455,7 +470,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_previous2_clicked"/>
++ <signal name="clicked" handler="on_new_req_previous2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -472,7 +487,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_next2_clicked"/>
++ <signal name="clicked" handler="on_new_req_next2_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -495,9 +510,10 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label101">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Root certificate prop</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Root certificate prop</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+@@ -505,19 +521,23 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox16">
++ <object class="GtkBox" id="vbox16">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkHBox" id="hbox18">
++ <object class="GtkBox" id="hbox18">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label96">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+ <property name="use_markup">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -528,9 +548,10 @@
+ <child>
+ <object class="GtkLabel" id="label97">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes"> </property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -541,23 +562,23 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkTable" id="table10">
++ <object class="GtkGrid" id="table10">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+- <property name="n_rows">2</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">True</property>
++ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkSpinButton" id="keylength_spinbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="max_length">5</property>
+- <property name="invisible_char">&#x2022;</property>
++ <property name="invisible_char">•</property>
+ <property name="adjustment">AdjustmentKeyLengthSpinButton1</property>
+ <property name="climb_rate">1024</property>
+ <property name="snap_to_ticks">True</property>
+@@ -566,15 +587,13 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHBox" id="hbox19">
++ <object class="GtkBox" id="hbox19">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="rsa_radiobutton1">
+@@ -586,7 +605,7 @@
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">dsa_radiobutton1</property>
+- <signal name="toggled" handler="on_new_req_privkey_type_toggle"/>
++ <signal name="toggled" handler="on_new_req_privkey_type_toggle" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -613,45 +632,46 @@
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label99">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Private key bit length:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Private key bit length:</property>
+ </object>
+ <packing>
++ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label98">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Private key type:</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Private key type:</property>
+ </object>
+ <packing>
+- <property name="x_options">GTK_FILL</property>
+- <property name="y_options"></property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkHButtonBox" id="hbuttonbox11">
++ <object class="GtkButtonBox" id="hbuttonbox11">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+@@ -677,7 +697,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++ <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -693,7 +713,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_previous3_clicked"/>
++ <signal name="clicked" handler="on_new_req_previous3_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -709,7 +729,7 @@
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+- <signal name="clicked" handler="on_new_req_commit_clicked"/>
++ <signal name="clicked" handler="on_new_req_commit_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -720,6 +740,7 @@
+ </object>
+ <packing>
+ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+@@ -731,6 +752,7 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label104">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">page 3</property>
+ </object>
+ <packing>
+--- gnomint-1.3.0.orig/gui/preferences_dialog.ui
++++ gnomint-1.3.0/gui/preferences_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="preferences_dialog">
++ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">General Preferences - gnoMint</property>
+ <property name="resizable">False</property>
+@@ -10,19 +11,51 @@
+ <property name="window_position">center-on-parent</property>
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox19">
++ <object class="GtkBox" id="dialog-vbox19">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area19">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="preferences_ok_button">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ <signal name="clicked" handler="preferences_window_ok_button_clicked_cb" swapped="no"/>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+ <object class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+- <object class="GtkVBox" id="vbox7">
++ <object class="GtkBox" id="vbox7">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="gnomekeyring_export_check">
+@@ -33,9 +66,11 @@
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+- <signal name="toggled" handler="preferences_window_gnomekeyring_export_toggled"/>
++ <signal name="toggled" handler="preferences_window_gnomekeyring_export_toggled" swapped="no"/>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+@@ -44,6 +79,7 @@
+ <child type="tab">
+ <object class="GtkLabel" id="label46">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Export options</property>
+ </object>
+ <packing>
+@@ -52,36 +88,12 @@
+ </child>
+ </object>
+ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
+ <property name="padding">6</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area19">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="preferences_ok_button">
+- <property name="label" translatable="yes">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- <signal name="clicked" handler="preferences_window_ok_button_clicked_cb"/>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+ </object>
+ </child>
+ <action-widgets>
+--- gnomint-1.3.0.orig/src/ca.h
++++ gnomint-1.3.0/src/ca.h
+@@ -47,7 +47,6 @@
+ gboolean ca_rcrt_view_toggled (GtkCheckMenuItem *button, gpointer user_data);
+ void ca_generate_crl (GtkCheckMenuItem *button, gpointer user_data);
+ gboolean ca_treeview_popup_timeout_program_cb (gpointer data);
+-void ca_treeview_popup_timeout_program (GdkEventButton *event);
+ gboolean ca_treeview_popup_handler (GtkTreeView *tree_view,
+ GdkEvent *event, gpointer user_data);
+ void ca_on_change_pwd_menuitem_activate (GtkMenuItem *menuitem, gpointer user_data);
+--- gnomint-1.3.0.orig/gui/export_certificate_dialog.ui
++++ gnomint-1.3.0/gui/export_certificate_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+- <requires lib="gtk+" version="2.16"/>
+- <!-- interface-naming-policy project-wide -->
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkDialog" id="export_certificate_dialog">
++ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Export certificate - gnoMint</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+@@ -10,32 +11,82 @@
+ <property name="icon">gnomint.png</property>
+ <property name="type_hint">dialog</property>
+ <property name="urgency_hint">True</property>
+- <property name="has_separator">False</property>
++ <child>
++ <placeholder/>
++ </child>
+ <child internal-child="vbox">
+- <object class="GtkVBox" id="dialog-vbox11">
++ <object class="GtkBox" id="dialog-vbox11">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox" id="dialog-action_area11">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="button1">
++ <property name="label">gtk-cancel</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="button4">
++ <property name="label">gtk-ok</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkVBox" id="vbox12">
++ <object class="GtkBox" id="vbox12">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">8</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label" translatable="yes">Please, choose which part of the
++saved certificate you want to export:</property>
++ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+- <property name="label" translatable="yes">Please, choose which part of the saved certificate you want to export:</property>
+- <property name="wrap">True</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox14">
++ <object class="GtkBox" id="vbox14">
+ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="publicpart_radiobutton1">
+@@ -48,22 +99,29 @@
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
++ <property name="can_focus">False</property>
++ <property name="margin_left">24</property>
++ <property name="margin_right">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
+ <property name="label" translatable="yes">&lt;i&gt;Export only the certificate to a public file, in PEM format.&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+@@ -79,22 +137,31 @@
+ <property name="group">publicpart_radiobutton1</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label15">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
+- <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PKCS#8 password-protected file. This file should only be accessed by the subject of the certificate.&lt;/i&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="margin_left">24</property>
++ <property name="margin_right">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
++ <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PKCS#8 password-
++protected file. This file should only be accessed by the
++subject of the certificate.&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+@@ -109,22 +176,31 @@
+ <property name="group">publicpart_radiobutton1</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
+- <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PEM file. This option should only be used for exporting certificates that will be used in unattended servers.&lt;/i&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="margin_left">24</property>
++ <property name="margin_right">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
++ <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PEM file. This option
++should only be used for exporting certificates that will be
++used in unattended servers.&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+@@ -139,72 +215,46 @@
+ <property name="group">publicpart_radiobutton1</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- <property name="xpad">24</property>
+- <property name="ypad">9</property>
+- <property name="label" translatable="yes">&lt;i&gt;Export both (private and public) parts to a password-protected PKCS#12 file. This kind of file can be imported by other common programs, such as web or mail clients.&lt;/i&gt;</property>
++ <property name="can_focus">False</property>
++ <property name="margin_left">24</property>
++ <property name="margin_right">24</property>
++ <property name="margin_top">9</property>
++ <property name="margin_bottom">9</property>
++ <property name="label" translatable="yes">&lt;i&gt;Export both (private and public) parts to a password-
++protected PKCS#12 file. This kind of file can be imported
++by other common programs, such as web or mail clients.&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0</property>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child internal-child="action_area">
+- <object class="GtkHButtonBox" id="dialog-action_area11">
+- <property name="visible">True</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton" id="button1">
+- <property name="label">gtk-cancel</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton" id="button4">
+- <property name="label">gtk-ok</property>
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_stock">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">0</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
diff --git a/system/gnomint/patches/09_gcc-10.patch b/system/gnomint/patches/09_gcc-10.patch
new file mode 100644
index 0000000000..0e9779335c
--- /dev/null
+++ b/system/gnomint/patches/09_gcc-10.patch
@@ -0,0 +1,33 @@
+Description: Fix FTBFS with GCC 10.
+Author: Yavor Doganov <yavor@gnu.org>
+Bug-Debian: https://bugs.debian.org/957287
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2020-06-23
+---
+
+--- gnomint-1.3.0.orig/src/ca_file.h
++++ gnomint-1.3.0/src/ca_file.h
+@@ -69,6 +69,7 @@
+
+ GList * ca_file_get_revoked_certs (guint64 ca_id, gchar **error);
+
++typedef
+ enum {CA_FILE_CA_COLUMN_ID=0,
+ CA_FILE_CA_COLUMN_SERIAL=1,
+ CA_FILE_CA_COLUMN_SUBJECT=2,
+@@ -78,6 +79,7 @@
+ CA_FILE_CA_COLUMN_NUMBER=6}
+ CaFileCAColumns;
+
++typedef
+ enum {CA_FILE_CERT_COLUMN_ID=0,
+ CA_FILE_CERT_COLUMN_IS_CA=1,
+ CA_FILE_CERT_COLUMN_SERIAL=2,
+@@ -93,6 +95,7 @@
+ CA_FILE_CERT_COLUMN_NUMBER=12}
+ CaFileCertColumns;
+
++typedef
+ enum {CA_FILE_CSR_COLUMN_ID=0,
+ CA_FILE_CSR_COLUMN_SUBJECT=1,
+ CA_FILE_CSR_COLUMN_PRIVATE_KEY_IN_DB=2,
diff --git a/system/gnomint/patches/gnutls3.patch b/system/gnomint/patches/gnutls3.patch
deleted file mode 100644
index 8ee3371884..0000000000
--- a/system/gnomint/patches/gnutls3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -aur a/src/import.c b/src/import.c
---- a/src/import.c 2010-05-31 23:01:37.000000000 +0200
-+++ b/src/import.c 2012-06-27 17:50:06.993671796 +0200
-@@ -695,7 +695,7 @@
-
- // After having all the parts unencrypted, we import all certificates first.
- for (i=0; i<n_bags; i++) {
-- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
- guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-
- for (i=0; i < num_elements_in_bag; i++) {
-@@ -722,7 +722,7 @@
-
- // Then, we import all PKCS8 private keys.
- for (i=0; i<n_bags; i++) {
-- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
- guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-
- for (i=0; i < num_elements_in_bag; i++) {
-@@ -796,7 +796,7 @@
- // Then we import the CRLs
-
- for (i=0; i<n_bags; i++) {
-- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
- guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-
- for (i=0; i < num_elements_in_bag; i++) {
-Nur in b/src: import.c~.