diff -Nru budgie-desktop-10.4/debian/changelog budgie-desktop-10.4/debian/changelog --- budgie-desktop-10.4/debian/changelog 2017-09-12 20:55:50.000000000 +0100 +++ budgie-desktop-10.4/debian/changelog 2017-09-14 19:53:04.000000000 +0100 @@ -1,3 +1,14 @@ +budgie-desktop (10.4-1ubuntu3.1) artful; urgency=medium + + * Bug-fix release (LP: #1716757) + - amend 0001-set-settings-window-title-to-match-the-.desktop-name.patch + include StartupWMClass to force the .desktop wmclass to match + the settings window class; this ensures plank always caters for + opening/closing the window and is no longer dependent on how + plank is launched + + -- David Mohammed Thu, 14 Sep 2017 19:53:04 +0100 + budgie-desktop (10.4-1ubuntu3) artful; urgency=medium * Bug-fix release (LP: #1716757) diff -Nru budgie-desktop-10.4/debian/patches/0001-set-settings-window-title-to-match-the-.desktop-name.patch budgie-desktop-10.4/debian/patches/0001-set-settings-window-title-to-match-the-.desktop-name.patch --- budgie-desktop-10.4/debian/patches/0001-set-settings-window-title-to-match-the-.desktop-name.patch 2017-09-12 20:55:50.000000000 +0100 +++ budgie-desktop-10.4/debian/patches/0001-set-settings-window-title-to-match-the-.desktop-name.patch 2017-09-14 19:53:04.000000000 +0100 @@ -1,18 +1,21 @@ Description: [PATCH] set settings window title to match the .desktop name #1146 + patch consists of two commits, first that has been committed, second has + been forwarded Author: David Mohammed Bug: https://github.com/budgie-desktop/budgie-desktop/issues/1146 Applied-Upstream: commit: 69fd617eed1da896d5a1bc5e82de901cd2a1a33d -Last-Update: 2017-09-09 +Forwarded: https://github.com/budgie-desktop/budgie-desktop/pull/1159 +Last-Update: 2017-09-14 --- src/panel/settings/settings_main.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/panel/settings/settings_main.vala b/src/panel/settings/settings_main.vala -index e6830c0..3c513f3 100644 ---- a/src/panel/settings/settings_main.vala -+++ b/src/panel/settings/settings_main.vala -@@ -48,7 +48,7 @@ public class SettingsWindow : Gtk.Window { +Index: budgie-desktop-10.4/src/panel/settings/settings_main.vala +=================================================================== +--- budgie-desktop-10.4.orig/src/panel/settings/settings_main.vala ++++ budgie-desktop-10.4/src/panel/settings/settings_main.vala +@@ -48,7 +48,7 @@ public class SettingsWindow : Gtk.Window add(layout); /* Have to override wmclass for pinning support */ @@ -21,6 +24,12 @@ set_wmclass("budgie-desktop-settings", "budgie-desktop-settings"); set_icon_name("preferences-desktop"); --- -2.11.0 - +Index: budgie-desktop-10.4/src/panel/budgie-desktop-settings.desktop.in +=================================================================== +--- budgie-desktop-10.4.orig/src/panel/budgie-desktop-settings.desktop.in ++++ budgie-desktop-10.4/src/panel/budgie-desktop-settings.desktop.in +@@ -8,3 +8,4 @@ Terminal=false + Type=Application + Categories=GNOME;GTK;System; + OnlyShowIn=Budgie; ++StartupWMClass=budgie-desktop-settings