[mate-panel] 08/10: debian/patches: 1000_prevent_menubar_destruction_when_enabling_global_menus.patch.

[Aron Xu]

This is an automated email from the git hooks/post-receive script.

aron pushed a commit to branch master
in repository mate-panel.

commit 759ff8233ff3945cad615fc781473779609eb695
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Mon Apr 10 14:15:06 2017 +0100

    debian/patches: 1000_prevent_menubar_destruction_when_enabling_global_menus.patch.
---
 ...ar_destruction_when_enabling_global_menus.patch | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/debian/patches/1000_prevent_menubar_destruction_when_enabling_global_menus.patch b/debian/patches/1000_prevent_menubar_destruction_when_enabling_global_menus.patch
new file mode 100644
index 0000000..4b0cf24
--- /dev/null
+++ b/debian/patches/1000_prevent_menubar_destruction_when_enabling_global_menus.patch
@@ -0,0 +1,26 @@
+Description: Prevent menu-bar being hidden when Global Menus are enabled.
+Author: Konstantin <ria.freelander at gmail.com>
+Abstract:
+ Properly interogate GTK settings to prevent the default menu bar being
+ entirely hidden when Global Menu are enabled.
+
+
+--- a/mate-panel/panel-menu-bar.c
++++ b/mate-panel/panel-menu-bar.c
+@@ -339,6 +339,7 @@ static gboolean panel_menu_bar_on_draw (GtkWidget* widget, cairo_t* cr, gpointer
+ static void panel_menu_bar_load(PanelWidget* panel, gboolean locked, int position, gboolean exactpos, const char* id)
+ {
+ 	PanelMenuBar* menubar;
++	GtkSettings* settings;
+ 
+ 	g_return_if_fail (panel != NULL);
+ 
+@@ -351,6 +352,8 @@ static void panel_menu_bar_load(PanelWidget* panel, gboolean locked, int positio
+ 		gtk_widget_destroy(GTK_WIDGET(menubar));
+ 		return;
+ 	}
++	settings = gtk_settings_get_for_screen(gtk_widget_get_screen(panel));
++	g_object_set(settings,"gtk-shell-shows-app-menu",FALSE,"gtk-shell-shows-menubar",FALSE,NULL);
+ 
+ 	mate_panel_applet_add_callback(menubar->priv->info, "help", GTK_STOCK_HELP, _("_Help"), NULL);
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-panel.git