fix bug 4239, 'Preferences: Text Options Header Display modal is not modal' (sic)

[claws.git] / src / plugins / pgpcore / select-keys.c

diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index 76b3ebd2c701c36e6697ab421699def9f5380a9c..cb9cb7847ce3e8a3fb7e5348e54d8237910a0b2e 100644 (file)
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -85,9 +85,6 @@ static void select_btn_cb (GtkWidget *widget, gpointer data);
 static void cancel_btn_cb (GtkWidget *widget, gpointer data);
 static void dont_encrypt_btn_cb (GtkWidget *widget, gpointer data);
 static void other_btn_cb (GtkWidget *widget, gpointer data);
-static void sort_keys (struct select_keys_s *sk, enum col_titles column);
-static void sort_keys_name (GtkWidget *widget, gpointer data);
-static void sort_keys_email (GtkWidget *widget, gpointer data);
 
 static gboolean use_untrusted (gpgme_key_t, gpgme_user_id_t uid, gpgme_protocol_t proto);
 
@@ -174,16 +171,6 @@ gpgmegtk_recipient_selection (GSList *recp_names, SelectionResult *result,
     return sk.kset;
 } 
 
-static void
-destroy_key (gpointer data)
-{
-    gpgme_key_t key = data;
-
-    debug_print("unref key %p\n", key);
-
-    gpgme_key_unref (key);
-}
-
 static void
 set_row (GtkListStore *store, gpgme_key_t key, gpgme_protocol_t proto)
 {
@@ -420,6 +407,7 @@ create_dialog (struct select_keys_s *sk)
     gtk_container_set_border_width (GTK_CONTAINER (window), 8);
     gtk_window_set_title (GTK_WINDOW (window), _("Select Keys"));
     gtk_window_set_modal (GTK_WINDOW (window), TRUE);
+    gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
     g_signal_connect (G_OBJECT (window), "delete_event",
                       G_CALLBACK (delete_event_cb), sk);
     g_signal_connect (G_OBJECT (window), "key_press_event",
@@ -713,7 +701,7 @@ use_untrusted (gpgme_key_t key, gpgme_user_id_t uid, gpgme_protocol_t proto)
     buf = g_strdup_printf(_("This encryption key is not fully trusted.\n"
               "If you choose to encrypt the message with this key, you don't\n"
               "know for sure that it will go to the person you mean it to.\n\n"
-              "Key details: ID %s, primary identity %s <%s>\n\n"
+              "Key details: ID %s, primary identity %s &lt;%s&gt;\n\n"
               "Do you trust this key enough to use it anyway?"), 
               key->subkeys->keyid, key->uids->name, key->uids->email);
     aval = alertpanel(title, buf,