4 files changed, 34 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 782222ab..749b34db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 # vim: set ts=2 sts=2 sw=2 expandtab :
-dist: focal
+dist: jammy
 language: shell
 os: linux
 services:
@@ -39,7 +39,8 @@ notifications:
 
 deploy:
 - provider: script
- edge: true
+ edge:
+ branch: v2.0.3-beta.4
 script: ./docker-build --verbose --config .build.yml --release github
 on:
 tags: true
diff --git a/NEWS b/NEWS
index 8e8fb568..432b0245 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,30 @@
+### mate-panel 1.26.6
+
+ * ci: fix deployment so a release tarball can be built
+
+### mate-panel 1.26.5
+
+ * status-notifier: Plug large leak with icons from paths
+
+### mate-panel 1.26.4
+
+ * update translations
+ * wnck-pager: Fix workspace switcher aspect ratio
+ * libmate-panel-applet: Fix build with gettext 0.22
+ * status-notifier: Show AttentionIcon when Status is NeedsAttention
+ * status-notifier: fix typo
+ * notification-area: stop warning on removal
+
 ### mate-panel 1.26.3
 
 * update translations
- windows-list.ui: lower gtk3 required version
- panel-applet: Fix leak in no-background code path
- clock: Fix memory leak
- wncklet: Fix crash thumbnailing dying or otherwise inaccessible windows
- notification_area: Reduce lifetime of the settings local variable (#1309)
- Register SNI host only if SNI is enabled
- wncklet: do not exceed workspace number when setting n_rows
+ * windows-list.ui: lower gtk3 required version
+ * panel-applet: Fix leak in no-background code path
+ * clock: Fix memory leak
+ * wncklet: Fix crash thumbnailing dying or otherwise inaccessible windows
+ * notification_area: Reduce lifetime of the settings local variable (#1309)
+ * Register SNI host only if SNI is enabled
+ * wncklet: do not exceed workspace number when setting n_rows
 
 ### mate-panel 1.26.2
 
diff --git a/applets/notification_area/status-notifier/sn-item-v0.c b/applets/notification_area/status-notifier/sn-item-v0.c
index 9a05a69f..5bc646f2 100644
--- a/applets/notification_area/status-notifier/sn-item-v0.c
+++ b/applets/notification_area/status-notifier/sn-item-v0.c
@@ -288,7 +288,12 @@ update (SnItemV0 *v0)
 if (pixbuf && icon_size > 1)
 {
 /*An icon specified by path and filename may be the wrong size for the tray */
- pixbuf = gdk_pixbuf_scale_simple (pixbuf, icon_size-2, icon_size-2, GDK_INTERP_BILINEAR);
+ GdkPixbuf *scaled_pixbuf;
+
+ scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf, icon_size-2, icon_size-2, GDK_INTERP_BILINEAR);
+ g_object_unref (pixbuf);
+ pixbuf = scaled_pixbuf;
+
 surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale, NULL);
 }
 if (pixbuf)
diff --git a/configure.ac b/configure.ac
index 2716fee6..9f8b0c25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mate-panel], [1.26.3], [https://github.com/mate-desktop/mate-panel/issues],
+AC_INIT([mate-panel], [1.26.6], [https://github.com/mate-desktop/mate-panel/issues],
 [mate-panel], [https://mate-desktop.org])
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar -Wno-portability check-news])