diff -Nru budgie-desktop-10.2.9/debian/changelog budgie-desktop-10.2.9/debian/changelog --- budgie-desktop-10.2.9/debian/changelog 2017-02-15 23:36:22.000000000 +0000 +++ budgie-desktop-10.2.9/debian/changelog 2017-02-22 22:51:13.000000000 +0000 @@ -1,3 +1,16 @@ +budgie-desktop (10.2.9-3ubuntu3) zesty; urgency=medium + + * Bug-fix release (LP: #1667144) + * Add 0002-check-that-schema-and-prefix-have-been-previously-cr.patch + - fix panel crash when C based applets are removed + * Add 0003-fix-crash-of-the-window-manager-when-the-current-loc.patch + - fix window manager crash when the current keyboard locale is + deleted (LP: #1661945) + Packaging Changes: + * update patch headers to resolve lintian issues + + -- David Mohammed Wed, 22 Feb 2017 19:43:56 +0000 + budgie-desktop (10.2.9-3ubuntu2) zesty; urgency=medium [ David Mohammed ] diff -Nru budgie-desktop-10.2.9/debian/patches/0002-check-that-schema-and-prefix-have-been-previously-cr.patch budgie-desktop-10.2.9/debian/patches/0002-check-that-schema-and-prefix-have-been-previously-cr.patch --- budgie-desktop-10.2.9/debian/patches/0002-check-that-schema-and-prefix-have-been-previously-cr.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.2.9/debian/patches/0002-check-that-schema-and-prefix-have-been-previously-cr.patch 2017-02-22 22:51:13.000000000 +0000 @@ -0,0 +1,29 @@ +From 7d77117dd906970c5b3527cc078446a6674128a4 Mon Sep 17 00:00:00 2001 +From: David Mohammed +Date: Sun, 19 Feb 2017 22:46:50 +0000 +Subject: [PATCH] check that schema and prefix have been previously created - + when removing C based widgets the private objects are deleted before applet + settings are interrogated +Forwarded: https://github.com/budgie-desktop/budgie-desktop/pull/805 +Origin: Other + +--- + src/plugin/applet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugin/applet.c b/src/plugin/applet.c +index e600ba1..a2c92fe 100644 +--- a/src/plugin/applet.c ++++ b/src/plugin/applet.c +@@ -231,7 +231,7 @@ GSettings *budgie_applet_get_applet_settings(BudgieApplet *self, gchar *uuid) + GSettings *settings = NULL; + gchar *path = NULL; + +- if (!self->priv->schema || !self->priv->prefix) { ++ if (!self || !self->priv || !self->priv->schema || !self->priv->prefix) { + return NULL; + } + +-- +2.7.4 + diff -Nru budgie-desktop-10.2.9/debian/patches/0003-fix-crash-of-the-window-manager-when-the-current-loc.patch budgie-desktop-10.2.9/debian/patches/0003-fix-crash-of-the-window-manager-when-the-current-loc.patch --- budgie-desktop-10.2.9/debian/patches/0003-fix-crash-of-the-window-manager-when-the-current-loc.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.2.9/debian/patches/0003-fix-crash-of-the-window-manager-when-the-current-loc.patch 2017-02-22 22:51:13.000000000 +0000 @@ -0,0 +1,28 @@ +From ffe97ae23e22e2603e114d9e36db0b5dca7c2b22 Mon Sep 17 00:00:00 2001 +From: fossfreedom +Date: Wed, 22 Feb 2017 19:31:05 +0000 +Subject: [PATCH] fix crash of the window manager when the current locale is + deleted +Forwarded: https://github.com/budgie-desktop/budgie-desktop/pull/805 +Origin: Other + +--- + src/wm/keyboard.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wm/keyboard.vala b/src/wm/keyboard.vala +index 4419665..2128ece 100644 +--- a/src/wm/keyboard.vala ++++ b/src/wm/keyboard.vala +@@ -283,7 +283,7 @@ public class KeyboardManager : GLib.Object + { + string engine_name; + InputSource? current = sources.index(current_source); +- if (current.ibus_engine != null) { ++ if (current != null && current.ibus_engine != null) { + engine_name = current.ibus_engine; + } else { + engine_name = DEFAULT_ENGINE; +-- +2.7.4 + diff -Nru budgie-desktop-10.2.9/debian/patches/adapt-to-mutter-324.patch budgie-desktop-10.2.9/debian/patches/adapt-to-mutter-324.patch --- budgie-desktop-10.2.9/debian/patches/adapt-to-mutter-324.patch 2017-02-15 23:36:22.000000000 +0000 +++ budgie-desktop-10.2.9/debian/patches/adapt-to-mutter-324.patch 2017-02-22 22:51:13.000000000 +0000 @@ -1,3 +1,10 @@ +From b80bb24966094aecd5b5d02f75b3f81f08a054e7 Wed Feb 15 00:00:00 2017 +From: David Mohammed +Date: Wed, 15 Feb 2017 23:17:27 -0000 +Subject: [PATCH] patch to support mutter 3.24 +Forwarded: not-needed +Origin: Other + Index: budgie-desktop-10.2.9/configure.ac =================================================================== --- budgie-desktop-10.2.9.orig/configure.ac diff -Nru budgie-desktop-10.2.9/debian/patches/series budgie-desktop-10.2.9/debian/patches/series --- budgie-desktop-10.2.9/debian/patches/series 2017-02-15 23:36:22.000000000 +0000 +++ budgie-desktop-10.2.9/debian/patches/series 2017-02-22 22:51:13.000000000 +0000 @@ -2,3 +2,5 @@ adapt-to-gsd-324.patch 0001-panel-Restore-missing-animations-GTK-3.22.patch adapt-to-mutter-324.patch +0002-check-that-schema-and-prefix-have-been-previously-cr.patch +0003-fix-crash-of-the-window-manager-when-the-current-loc.patch