diff options
| author | raveit65 <[email protected]> | 2019-06-15 12:00:23 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-06-15 12:00:23 +0200 |
| commit | f285d0281b82f9f84d422d2947b2b4b41174fb24 (patch) | |
| tree | ad70178736a082f33fc327ab4afb101dec54b06f /mate-panel/panel-menu-button.c | |
| parent | f9228ea39d53bb787dc4ecd9aea63458640dac08 (diff) | |
| download | mate-panel-f285d0281b82f9f84d422d2947b2b4b41174fb24.tar.bz2 mate-panel-f285d0281b82f9f84d422d2947b2b4b41174fb24.tar.xz | |
Revert "menu-bar: transfer focus correctly on alt-F1"
This reverts commit cdaf08f254981d920918fcfdb1aa356dfdf66306.
Fixes https://github.com/mate-desktop/marco/issues/209
Diffstat (limited to 'mate-panel/panel-menu-button.c')
| -rw-r--r-- | mate-panel/panel-menu-button.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c index 1574d2f3..b111edff 100644 --- a/mate-panel/panel-menu-button.c +++ b/mate-panel/panel-menu-button.c @@ -26,12 +26,9 @@ #include "panel-menu-button.h" -#include <X11/Xlib.h> - #include <string.h> #include <glib/gi18n.h> #include <gio/gio.h> -#include <gdk/gdkx.h> #include <matemenu-tree.h> @@ -95,8 +92,6 @@ struct _PanelMenuButtonPrivate { char *custom_icon; char *tooltip; - Window interrupted_window; - MenuPathRoot path_root; guint use_menu_path : 1; guint use_custom_icon : 1; @@ -429,23 +424,12 @@ panel_menu_button_recreate_menu (PanelMenuButton *button) button->priv->menu = NULL; } -static gboolean panel_menu_button_menu_deactivate (GtkWidget* widget, PanelMenuButton* button) -{ - GtkWidget *toplevel = gtk_widget_get_toplevel(widget); - panel_util_set_current_active_window(toplevel, button->priv->interrupted_window); - button->priv->interrupted_window = None; - - return FALSE; -} - void panel_menu_button_popup_menu (PanelMenuButton *button, guint n_button, guint32 activate_time) { GdkScreen *screen; - GtkWidget *toplevel; - GdkWindow *window; g_return_if_fail (PANEL_IS_MENU_BUTTON (button)); @@ -465,12 +449,6 @@ panel_menu_button_popup_menu (PanelMenuButton *button, GTK_WIDGET (button), n_button, activate_time); - - g_signal_connect(GTK_MENU_SHELL (button->priv->menu), "deactivate", G_CALLBACK (panel_menu_button_menu_deactivate), button); - toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button->priv->toplevel)); - button->priv->interrupted_window = panel_util_get_current_active_window (toplevel); - window = gtk_widget_get_window (toplevel); - panel_util_set_current_active_window (toplevel, GDK_WINDOW_XID(window)); } static void |