|
 |
4d8e186 |
From 7eab29ff1d2fb9d26db3102b7ffd6e3dcde640af Mon Sep 17 00:00:00 2001
|
|
|
4d8e186 |
Message-Id: <7eab29ff1d2fb9d26db3102b7ffd6e3dcde640af.1351081950.git.crobinso@redhat.com>
|
|
|
4d8e186 |
In-Reply-To: <6f95a37c1dd600f05b6678d1c142d38050eddf73.1351081950.git.crobinso@redhat.com>
|
|
|
4d8e186 |
References: <6f95a37c1dd600f05b6678d1c142d38050eddf73.1351081950.git.crobinso@redhat.com>
|
|
|
4d8e186 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
4d8e186 |
Date: Sun, 14 Oct 2012 00:15:04 -0400
|
|
|
4d8e186 |
Subject: [PATCH 3/3] browse_local: Fix choosing directory of F17
|
|
|
4d8e186 |
|
|
|
4d8e186 |
Seems hiding the dialog before retrieving the directory path stopped
|
|
|
4d8e186 |
working. Remove the needlessness anyways
|
|
|
4d8e186 |
|
|
|
4d8e186 |
https://bugzilla.redhat.com/show_bug.cgi?id=849450
|
|
|
4d8e186 |
(cherry picked from commit 71e5ac2a0a8578f466c74d5100943d44815ab8bd)
|
|
|
4d8e186 |
---
|
|
|
4d8e186 |
src/virtManager/util.py | 23 +++++++++--------------
|
|
|
4d8e186 |
1 file changed, 9 insertions(+), 14 deletions(-)
|
|
|
4d8e186 |
|
|
|
4d8e186 |
diff --git a/src/virtManager/util.py b/src/virtManager/util.py
|
|
|
4d8e186 |
index 6b8a953..b75541c 100644
|
|
|
4d8e186 |
--- a/src/virtManager/util.py
|
|
|
4d8e186 |
+++ b/src/virtManager/util.py
|
|
|
4d8e186 |
@@ -208,11 +208,11 @@ def browse_local(parent, dialog_name, conn, start_folder=None,
|
|
|
4d8e186 |
if choose_button is None:
|
|
|
4d8e186 |
choose_button = gtk.STOCK_OPEN
|
|
|
4d8e186 |
|
|
|
4d8e186 |
- fcdialog = gtk.FileChooserDialog(dialog_name, parent,
|
|
|
4d8e186 |
- dialog_type,
|
|
|
4d8e186 |
- (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
|
|
|
4d8e186 |
- choose_button, gtk.RESPONSE_ACCEPT),
|
|
|
4d8e186 |
- None)
|
|
|
4d8e186 |
+ fcdialog = gtk.FileChooserDialog(title=dialog_name,
|
|
|
4d8e186 |
+ parent=parent,
|
|
|
4d8e186 |
+ action=dialog_type,
|
|
|
4d8e186 |
+ buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
|
|
|
4d8e186 |
+ choose_button, gtk.RESPONSE_ACCEPT))
|
|
|
4d8e186 |
fcdialog.set_default_response(gtk.RESPONSE_ACCEPT)
|
|
|
4d8e186 |
|
|
|
4d8e186 |
# If confirm is set, warn about a file overwrite
|
|
|
4d8e186 |
@@ -245,15 +245,10 @@ def browse_local(parent, dialog_name, conn, start_folder=None,
|
|
|
4d8e186 |
fcdialog.set_current_folder(start_folder)
|
|
|
4d8e186 |
|
|
|
4d8e186 |
# Run the dialog and parse the response
|
|
|
4d8e186 |
- response = fcdialog.run()
|
|
|
4d8e186 |
- fcdialog.hide()
|
|
|
4d8e186 |
- if (response == gtk.RESPONSE_ACCEPT):
|
|
|
4d8e186 |
- filename = fcdialog.get_filename()
|
|
|
4d8e186 |
- fcdialog.destroy()
|
|
|
4d8e186 |
- ret = filename
|
|
|
4d8e186 |
- else:
|
|
|
4d8e186 |
- fcdialog.destroy()
|
|
|
4d8e186 |
- ret = None
|
|
|
4d8e186 |
+ ret = None
|
|
|
4d8e186 |
+ if fcdialog.run() == gtk.RESPONSE_ACCEPT:
|
|
|
4d8e186 |
+ ret = fcdialog.get_filename()
|
|
|
4d8e186 |
+ fcdialog.destroy()
|
|
|
4d8e186 |
|
|
|
4d8e186 |
# Store the chosen directory in gconf if necessary
|
|
|
4d8e186 |
if ret and browse_reason and not ret.startswith("/dev"):
|
|
|
4d8e186 |
--
|
|
|
4d8e186 |
1.7.11.7
|
|
|
4d8e186 |
|