[mate-panel] 02/06: debian/patches: Drop 1000_prevent_menubar_destruction_when_enabling_global_menus.patch. Applied upstream.

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch ubuntu/bionic
in repository mate-panel.

commit 0321774092b7bc8dc5ee2406a5693970d5310d3d
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Tue Jan 23 12:41:32 2018 +0000

    debian/patches: Drop 1000_prevent_menubar_destruction_when_enabling_global_menus.patch. Applied upstream.
---
 ...ar_destruction_when_enabling_global_menus.patch | 26 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 27 deletions(-)

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
deleted file mode 100644
index 4b0cf24..0000000
--- a/debian/patches/1000_prevent_menubar_destruction_when_enabling_global_menus.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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);
- 
diff --git a/debian/patches/series b/debian/patches/series
index d444f57..5f23ddb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-1000_prevent_menubar_destruction_when_enabling_global_menus.patch
 0001_no_scale.patch

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