From bb93ea2b3cdc88378155feb4fff646452c4e6f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Tue, 20 Dec 2005 14:44:46 +0000 Subject: [PATCH] - hopefully make the askpass dialog less confusing (#174765) --- openssh-4.2p1-askpass-progress.patch | 24 +++++++++++++++--------- openssh.spec | 5 ++++- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/openssh-4.2p1-askpass-progress.patch b/openssh-4.2p1-askpass-progress.patch index 48d1ec9..c4a50b2 100644 --- a/openssh-4.2p1-askpass-progress.patch +++ b/openssh-4.2p1-askpass-progress.patch @@ -1,5 +1,5 @@ ---- openssh-4.2p1/contrib/gnome-ssh-askpass2.c.progress 2005-11-21 19:24:54.000000000 +0100 -+++ openssh-4.2p1/contrib/gnome-ssh-askpass2.c 2005-11-22 17:29:08.000000000 +0100 +--- openssh-4.2p1/contrib/gnome-ssh-askpass2.c.progress 2005-11-28 11:11:24.000000000 +0100 ++++ openssh-4.2p1/contrib/gnome-ssh-askpass2.c 2005-12-20 15:22:42.000000000 +0100 @@ -53,6 +53,7 @@ #include #include @@ -34,34 +34,40 @@ GdkGrabStatus status; grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); -@@ -102,13 +114,24 @@ +@@ -102,13 +114,31 @@ "%s", message); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, -+ FALSE, 4); ++ FALSE, 0); + gtk_widget_show(hbox); + entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), entry, FALSE, -- FALSE, 0); -+ gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, -+ FALSE, 4); ++ gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, + FALSE, 0); + gtk_entry_set_width_chars(GTK_ENTRY(entry), 2); gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); gtk_widget_grab_focus(entry); gtk_widget_show(entry); ++ hbox = gtk_hbox_new(FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, ++ FALSE, 8); ++ gtk_widget_show(hbox); ++ + progress = gtk_progress_bar_new(); ++ ++ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Passphrase length hidden intentionally"); + gtk_box_pack_start(GTK_BOX(hbox), progress, TRUE, -+ TRUE, 4); ++ TRUE, 5); + gtk_widget_show(progress); + gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH"); gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(dialog))->label), -@@ -118,6 +141,8 @@ +@@ -118,6 +148,8 @@ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(ok_dialog), dialog); diff --git a/openssh.spec b/openssh.spec index e1fe8e7..1fee359 100644 --- a/openssh.spec +++ b/openssh.spec @@ -58,7 +58,7 @@ Summary: The OpenSSH implementation of SSH protocol versions 1 and 2. Name: openssh Version: 4.2p1 -%define rel 9.1 +%define rel 10 %if %{rescue} %define %{rel}rescue %else @@ -464,6 +464,9 @@ fi %endif %changelog +* Tue Dec 20 2005 Tomas Mraz - 4.2p1-10 +- hopefully make the askpass dialog less confusing (#174765) + * Fri Dec 09 2005 Jesse Keating - rebuilt