[evolution/gnome-3-32] Revert "M!18 - [Wayland] Clicking on "Insert Emoticon" triggers shortcut inhibition"



commit ed7671c2c9a75638eba3f98a0ce9bb7762247eb2
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jun 14 14:17:15 2019 +0200

    Revert "M!18 - [Wayland] Clicking on "Insert Emoticon" triggers shortcut inhibition"
    
    This reverts commit 09933d12a844c527b1eab54bb6cdba620cacf080.
    
    Due to found regression mentioned in https://gitlab.gnome.org/GNOME/evolution/merge_requests/20

 src/e-util/e-emoticon-tool-button.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/src/e-util/e-emoticon-tool-button.c b/src/e-util/e-emoticon-tool-button.c
index 5b7a666ab3..bf274d3ab6 100644
--- a/src/e-util/e-emoticon-tool-button.c
+++ b/src/e-util/e-emoticon-tool-button.c
@@ -380,8 +380,7 @@ emoticon_tool_button_popup (EEmoticonToolButton *button)
                gtk_window_set_transient_for (GTK_WINDOW (button->priv->window), GTK_WINDOW (toplevel));
 
        /* Try to grab the pointer and keyboard. */
-       gtk_widget_realize (button->priv->window);
-       window = gtk_widget_get_window (button->priv->window);
+       window = gtk_widget_get_window (toplevel);
        grab_status = !keyboard ||
                gdk_device_grab (
                        keyboard, window,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]