|
 |
0d20ef |
From 89bef8662be9ec004fd0c71f863025b2c9e0ee8c Mon Sep 17 00:00:00 2001
|
|
|
0d20ef |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
0d20ef |
Date: Thu, 20 Nov 2014 15:37:44 +0000
|
|
|
0d20ef |
Subject: [PATCH] p2v: gui: Get the correct button for cancel_button.
|
|
|
0d20ef |
|
|
|
0d20ef |
I was fetching cancel_button from the wrong dialog (conv_dlg, not
|
|
|
0d20ef |
run_dlg), and therefore getting the wrong button.
|
|
|
0d20ef |
|
|
|
0d20ef |
This explains why the back button on the conversion dialog was always
|
|
|
0d20ef |
insensitive. It's because cancel_button was assigned to this button,
|
|
|
0d20ef |
and then I was setting cancel_button to insensitive.
|
|
|
0d20ef |
|
|
|
0d20ef |
(cherry picked from commit 5d695d37a56a01b8f72a086eaa3bc9de94f6fe3c)
|
|
|
0d20ef |
---
|
|
|
0d20ef |
p2v/gui.c | 2 +-
|
|
|
0d20ef |
v2v/TODO | 1 -
|
|
|
0d20ef |
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
0d20ef |
|
|
|
0d20ef |
diff --git a/p2v/gui.c b/p2v/gui.c
|
|
|
0d20ef |
index 9a004b5..aa483db 100644
|
|
|
0d20ef |
--- a/p2v/gui.c
|
|
|
0d20ef |
+++ b/p2v/gui.c
|
|
|
0d20ef |
@@ -1093,7 +1093,7 @@ create_running_dialog (void)
|
|
|
0d20ef |
gtk_dialog_add_buttons (GTK_DIALOG (run_dlg),
|
|
|
0d20ef |
_("Cancel conversion"), 1,
|
|
|
0d20ef |
NULL);
|
|
|
0d20ef |
- cancel_button = gtk_dialog_get_widget_for_response (GTK_DIALOG (conv_dlg), 1);
|
|
|
0d20ef |
+ cancel_button = gtk_dialog_get_widget_for_response (GTK_DIALOG (run_dlg), 1);
|
|
|
0d20ef |
gtk_widget_set_sensitive (cancel_button, FALSE);
|
|
|
0d20ef |
|
|
|
0d20ef |
/* Signals. */
|
|
|
0d20ef |
diff --git a/v2v/TODO b/v2v/TODO
|
|
|
0d20ef |
index b2d3fbd..54a3610 100644
|
|
|
0d20ef |
--- a/v2v/TODO
|
|
|
0d20ef |
+++ b/v2v/TODO
|
|
|
0d20ef |
@@ -11,7 +11,6 @@ Proper progress bars when copying.
|
|
|
0d20ef |
p2v:
|
|
|
0d20ef |
|
|
|
0d20ef |
- network dialog and network configuration
|
|
|
0d20ef |
- - why is the Back button insensitive?
|
|
|
0d20ef |
|
|
|
0d20ef |
p2v/main.c:/* XXX Copied from fish/options.c. */
|
|
|
0d20ef |
v2v/convert_linux.ml: (* Get/construct the version. XXX Read this fro
|
|
|
0d20ef |
--
|
|
|
0d20ef |
1.8.3.1
|
|
|
0d20ef |
|