[master] [PATCH] Only close AddLayout dialog on double-click if something is selected (#887371)

[Vratislav Podzimek]

The AddLayout dialog has a handler for double-click on the selection
that closes the dialog. But the selection can be double-clicked even
if it contains nothing (all filtered out) which may cause traceback.

Signed-off-by: Vratislav Podzimek 
---
 pyanaconda/ui/gui/spokes/keyboard.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py
index 97d965f..908de71 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/pyanaconda/ui/gui/spokes/keyboard.py
@@ -153,10 +153,12 @@ class AddLayoutDialog(GUIObject):

def on_layout_view_button_press(self, widget, event, *args):
         # BUG: Gdk.EventType.2BUTTON_PRESS results in syntax error
-        if event.type == getattr(Gdk.EventType, "2BUTTON_PRESS"):
-            # double-click should close the dialog
-            button = self.builder.get_object("confirmAddButton")
-            button.emit("clicked")
+        if event.type == getattr(Gdk.EventType, "2BUTTON_PRESS") and \
+                self._confirmAddButton.get_sensitive():
+            # double-click should close the dialog if something is selected
+            # (i.e. the Add button is sensitive)
+            # @see on_add_layout_selection_changed
+            self._confirmAddButton.emit("clicked")

# let the other actions happen as well
         return False

[Brian C. Lane]

On Mon, Dec 17, 2012 at 09:52:54AM +0100, Vratislav Podzimek wrote:
> The AddLayout dialog has a handler for double-click on the selection
> that closes the dialog. But the selection can be double-clicked even
> if it contains nothing (all filtered out) which may cause traceback.
> Signed-off-by: Vratislav Podzimek
>
> pyanaconda/ui/gui/spokes/keyboard.py | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)

ACK