09d7e68ab5
- drop old build_6x ifs from spec file
- improve gnome-ssh-askpass so it doesn't reveal number of passphrase
characters to person looking at the display
- less hackish fix for the __USE_GNU problem
73 lines
2.2 KiB
Diff
73 lines
2.2 KiB
Diff
--- 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
|
|
@@ -53,6 +53,7 @@
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <X11/Xlib.h>
|
|
+#include <glib.h>
|
|
#include <gtk/gtk.h>
|
|
#include <gdk/gdkx.h>
|
|
|
|
@@ -83,13 +84,24 @@
|
|
gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
|
|
}
|
|
|
|
+static void
|
|
+move_progress(GtkWidget *entry, gpointer progress)
|
|
+{
|
|
+ gdouble step;
|
|
+ g_return_if_fail(GTK_IS_PROGRESS_BAR(progress));
|
|
+
|
|
+ step = g_random_double_range(0.03, 0.1);
|
|
+ gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(progress), step);
|
|
+ gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress));
|
|
+}
|
|
+
|
|
static int
|
|
passphrase_dialog(char *message)
|
|
{
|
|
const char *failed;
|
|
char *passphrase, *local;
|
|
int result, grab_tries, grab_server, grab_pointer;
|
|
- GtkWidget *dialog, *entry;
|
|
+ GtkWidget *dialog, *entry, *progress, *hbox;
|
|
GdkGrabStatus status;
|
|
|
|
grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL);
|
|
@@ -102,13 +114,24 @@
|
|
"%s",
|
|
message);
|
|
|
|
+ hbox = gtk_hbox_new(FALSE, 0);
|
|
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE,
|
|
+ FALSE, 4);
|
|
+ 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_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);
|
|
|
|
+ progress = gtk_progress_bar_new();
|
|
+ gtk_box_pack_start(GTK_BOX(hbox), progress, TRUE,
|
|
+ TRUE, 4);
|
|
+ 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 @@
|
|
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
|
|
g_signal_connect(G_OBJECT(entry), "activate",
|
|
G_CALLBACK(ok_dialog), dialog);
|
|
+ g_signal_connect(G_OBJECT(entry), "changed",
|
|
+ G_CALLBACK(move_progress), progress);
|
|
|
|
gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
|
|
|