Commit 1e0c737ed90fb2a38cb3ecdd4c5596d99fa48f6a

Authored by samuel thibault
1 parent db848154

refresh

Showing 1 changed file with 17 additions and 18 deletions   Show diff stats
debian/patches/2001_window-activate.patch
... ... @@ -22,8 +22,13 @@ Date: Thu Aug 30 18:11:29 2018 +0200
22 22  
23 23 Fixes #851
24 24  
25   -diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
26   -index 955e9c4..06fca81 100644
  25 +---
  26 + mate-panel/panel-menu-bar.c | 22 +++++++++
  27 + mate-panel/panel-menu-button.c | 22 +++++++++
  28 + mate-panel/panel-util.c | 92 +++++++++++++++++++++++++++++++++++++++++
  29 + mate-panel/panel-util.h | 5 ++
  30 + 4 files changed, 141 insertions(+)
  31 +
27 32 --- a/mate-panel/panel-menu-bar.c
28 33 +++ b/mate-panel/panel-menu-bar.c
29 34 @@ -28,6 +28,9 @@
... ... @@ -45,7 +50,7 @@ index 955e9c4..06fca81 100644
45 50 };
46 51  
47 52 enum {
48   -@@ -83,6 +88,15 @@ static gboolean panel_menu_bar_reinit_tooltip(GtkWidget* widget, PanelMenuBar* m
  53 +@@ -83,6 +88,15 @@ static gboolean panel_menu_bar_reinit_to
49 54 return FALSE;
50 55 }
51 56  
... ... @@ -61,7 +66,7 @@ index 955e9c4..06fca81 100644
61 66 static gboolean panel_menu_bar_hide_tooltip_and_focus(GtkWidget* widget, PanelMenuBar* menubar)
62 67 {
63 68 /* remove focus that would be drawn on the currently focused child of
64   -@@ -108,6 +122,7 @@ static void panel_menu_bar_setup_tooltip(PanelMenuBar* menubar)
  69 +@@ -108,6 +122,7 @@ static void panel_menu_bar_setup_tooltip
65 70  
66 71 /* Reset tooltip when the menu bar is not used */
67 72 g_signal_connect(GTK_MENU_SHELL (menubar), "deactivate", G_CALLBACK (panel_menu_bar_reinit_tooltip), menubar);
... ... @@ -69,7 +74,7 @@ index 955e9c4..06fca81 100644
69 74 }
70 75  
71 76 static void panel_menu_bar_update_visibility (GSettings* settings, gchar* key, PanelMenuBar* menubar)
72   -@@ -411,11 +426,18 @@ void panel_menu_bar_popup_menu(PanelMenuBar* menubar, guint32 activate_time)
  77 +@@ -414,11 +429,18 @@ void panel_menu_bar_popup_menu(PanelMenu
73 78 {
74 79 GtkMenu* menu;
75 80 GtkMenuShell* menu_shell;
... ... @@ -88,8 +93,6 @@ index 955e9c4..06fca81 100644
88 93 /*
89 94 * We need to call _gtk_menu_shell_activate() here as is done in
90 95 * window_key_press_handler in gtkmenubar.c which pops up menu
91   -diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c
92   -index ae6db42..56969cc 100644
93 96 --- a/mate-panel/panel-menu-button.c
94 97 +++ b/mate-panel/panel-menu-button.c
95 98 @@ -26,9 +26,12 @@
... ... @@ -114,7 +117,7 @@ index ae6db42..56969cc 100644
114 117 MenuPathRoot path_root;
115 118 guint use_menu_path : 1;
116 119 guint use_custom_icon : 1;
117   -@@ -437,12 +442,23 @@ panel_menu_button_recreate_menu (PanelMenuButton *button)
  120 +@@ -424,12 +429,23 @@ panel_menu_button_recreate_menu (PanelMe
118 121 button->priv->menu = NULL;
119 122 }
120 123  
... ... @@ -138,10 +141,10 @@ index ae6db42..56969cc 100644
138 141  
139 142 g_return_if_fail (PANEL_IS_MENU_BUTTON (button));
140 143  
141   -@@ -460,6 +476,12 @@ panel_menu_button_popup_menu (PanelMenuButton *button,
142   - GTK_WIDGET (button),
143   - n_button,
144   - activate_time);
  144 +@@ -449,6 +465,12 @@ panel_menu_button_popup_menu (PanelMenuB
  145 + GTK_WIDGET (button),
  146 + n_button,
  147 + activate_time);
145 148 +
146 149 + g_signal_connect(GTK_MENU_SHELL (button->priv->menu), "deactivate", G_CALLBACK (panel_menu_button_menu_deactivate), button);
147 150 + toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button->priv->toplevel));
... ... @@ -151,8 +154,6 @@ index ae6db42..56969cc 100644
151 154 }
152 155  
153 156 static void
154   -diff --git a/mate-panel/panel-util.c b/mate-panel/panel-util.c
155   -index 1106f03..6183cca 100644
156 157 --- a/mate-panel/panel-util.c
157 158 +++ b/mate-panel/panel-util.c
158 159 @@ -23,11 +23,15 @@
... ... @@ -180,7 +181,7 @@ index 1106f03..6183cca 100644
180 181 char *
181 182 panel_util_make_exec_uri_for_desktop (const char *exec)
182 183 {
183   -@@ -1241,3 +1247,89 @@ panel_util_get_file_optional_homedir (const char *location)
  184 +@@ -1232,3 +1238,89 @@ panel_util_get_file_optional_homedir (co
184 185  
185 186 return file;
186 187 }
... ... @@ -270,8 +271,6 @@ index 1106f03..6183cca 100644
270 271 + SubstructureRedirectMask | SubstructureNotifyMask,
271 272 + &xev);
272 273 +}
273   -diff --git a/mate-panel/panel-util.h b/mate-panel/panel-util.h
274   -index 8d9fb2e..fb1303a 100644
275 274 --- a/mate-panel/panel-util.h
276 275 +++ b/mate-panel/panel-util.h
277 276 @@ -3,6 +3,7 @@
... ... @@ -282,7 +281,7 @@ index 8d9fb2e..fb1303a 100644
282 281  
283 282 #ifdef __cplusplus
284 283 extern "C" {
285   -@@ -66,6 +67,10 @@ void panel_util_set_tooltip_text (GtkWidget *widget,
  284 +@@ -66,6 +67,10 @@ void panel_util_set_tooltip_text (GtkWid
286 285  
287 286 GFile *panel_util_get_file_optional_homedir (const char *location);
288 287  
... ...