[mate-settings-daemon] 02/07: debian/patches: Drop 1000_global_menu_support.diff. 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-settings-daemon.

commit a55ae0bf7d494741e17d74d59cd69a09174afa09
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Tue Jan 23 11:54:44 2018 +0000

    debian/patches: Drop 1000_global_menu_support.diff. Applied upstream.
---
 debian/patches/1000_global_menu_support.diff | 21 ---------------------
 debian/patches/series                        |  2 --
 2 files changed, 23 deletions(-)

diff --git a/debian/patches/1000_global_menu_support.diff b/debian/patches/1000_global_menu_support.diff
deleted file mode 100644
index 3173ffe..0000000
--- a/debian/patches/1000_global_menu_support.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Add interfaces to support Global Menu. (LP: #1675956)
-Author: Martin Wimpress <martin at ubuntu-mate.org>
-Abstract:
- These interfaces were accidently not included in the
- mate-settings-daemon 1.18.0 release. This patch adds them so Global
- Menu integration can be supported.
-
-
-diff --git a/plugins/xsettings/msd-xsettings-manager.c b/plugins/xsettings/msd-xsettings-manager.c
-index 5e2e585..445be61 100644
---- a/plugins/xsettings/msd-xsettings-manager.c
-+++ b/plugins/xsettings/msd-xsettings-manager.c
-@@ -198,6 +198,8 @@ static TranslationEntry translations [] = {
-         { INTERFACE_SCHEMA, "icon-theme",             "Net/IconThemeName",             translate_string_string },
-         { INTERFACE_SCHEMA, "file-chooser-backend",   "Gtk/FileChooserBackend",        translate_string_string },
-         { INTERFACE_SCHEMA, "gtk-decoration-layout",  "Gtk/DecorationLayout",          translate_string_string },
-+        { INTERFACE_SCHEMA, "gtk-shell-shows-app-menu","Gtk/ShellShowsAppMenu",        translate_bool_int },
-+        { INTERFACE_SCHEMA, "gtk-shell-shows-menubar","Gtk/ShellShowsMenubar",         translate_bool_int },
-         { INTERFACE_SCHEMA, "menus-have-icons",       "Gtk/MenuImages",                translate_bool_int },
-         { INTERFACE_SCHEMA, "buttons-have-icons",     "Gtk/ButtonImages",              translate_bool_int },
-         { INTERFACE_SCHEMA, "menubar-accel",          "Gtk/MenuBarAccel",              translate_string_string },
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d9786e7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-1000_global_menu_support.diff
-

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