48 lines
1.7 KiB
Text
48 lines
1.7 KiB
Text
$NetBSD: patch-ae,v 1.3 2008/10/30 14:52:14 bad Exp $
|
|
|
|
--- hydra-gtk/src/callbacks.c.orig 2005-09-22 17:19:27.000000000 +0200
|
|
+++ hydra-gtk/src/callbacks.c 2008-10-30 14:05:58.000000000 +0100
|
|
@@ -69,21 +69,6 @@
|
|
|
|
options[0] = HYDRA_BIN;
|
|
|
|
- /* get the target, or target list */
|
|
- widget = lookup_widget(GTK_WIDGET(wndMain), "radioTarget1");
|
|
- if ( gtk_toggle_button_get_active((GtkToggleButton *) widget) ){
|
|
- widget = lookup_widget(GTK_WIDGET(wndMain), "entTarget");
|
|
- options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
|
|
- } else {
|
|
- options[i++] = "-M";
|
|
- widget = lookup_widget(GTK_WIDGET(wndMain), "entTargetFile");
|
|
- options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
|
|
- }
|
|
-
|
|
- /* get the service */
|
|
- widget = lookup_widget(GTK_WIDGET(wndMain), "entProtocol");
|
|
- options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
|
|
-
|
|
/* get the port */
|
|
widget = lookup_widget(GTK_WIDGET(wndMain), "spnPort");
|
|
j = gtk_spin_button_get_value_as_int((GtkSpinButton *) widget);
|
|
@@ -284,6 +269,21 @@
|
|
}
|
|
}
|
|
|
|
+ /* lastly, get the target, or target list */
|
|
+ widget = lookup_widget(GTK_WIDGET(wndMain), "radioTarget1");
|
|
+ if ( gtk_toggle_button_get_active((GtkToggleButton *) widget) ){
|
|
+ widget = lookup_widget(GTK_WIDGET(wndMain), "entTarget");
|
|
+ options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
|
|
+ } else {
|
|
+ options[i++] = "-M";
|
|
+ widget = lookup_widget(GTK_WIDGET(wndMain), "entTargetFile");
|
|
+ options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
|
|
+ }
|
|
+
|
|
+ /* get the service */
|
|
+ widget = lookup_widget(GTK_WIDGET(wndMain), "entProtocol");
|
|
+ options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
|
|
+
|
|
/* clean up proxy settings */
|
|
unsetenv("HYDRA_PROXY_HTTP");
|
|
unsetenv("HYDRA_PROXY_CONNECT");
|