Merge ~3v1n0/bamf:ubuntu/focal into bamf:ubuntu/focal

[Marco Trevisan (Treviño)]

Unmerged commits

07e11b9... by Marco Trevisan (Treviño) on 2021-02-12

Update changelog

f0ddb87... by Corentin Noël on 2021-01-18

bamf-view: avoid overriding the `timeout` variables after setting them

For instance, calling `active-changed` might reset the active_changed_idle variable
and we are replacing it by a zero just after.

LP: #1915529

c44386e... by Marco Trevisan (Treviño) on 2021-02-12

debian/patches: Remove already applied patches

diff --git a/debian/changelog b/debian/changelog
index 0b2d73b..161e179 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bamf (0.5.3+18.04.20180207.2-0ubuntu3) UNRELEASED; urgency=medium
+
+  [ Marco Trevisan (Treviño) ]
+  * debian/patches: Remove already applied patches
+
+  [ Corentin Noël ]
+  * bamf-view: avoid overriding the `timeout` variables after setting them
+    (LP: #1915529)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 12 Feb 2021 16:55:57 +0100
+
 bamf (0.5.3+18.04.20180207.2-0ubuntu2) focal; urgency=medium
 
   * Cherry-pick from Debian, to fix FTBFS without python-lxml:
diff --git a/debian/patches/1004_py2to3_gtester2xunit.patch b/debian/patches/1004_py2to3_gtester2xunit.patch
deleted file mode 100644
index bd8af9b..0000000
--- a/debian/patches/1004_py2to3_gtester2xunit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Run gtester2xunit.py with Python3, port libxml2/libxslt to lxml module..
-Author: Mike Gabriel <[e-mail]>
-Origin: https://salsa.debian.org/debian-mate-team/bamf/-/commit/4c420fa6a035680cd071684c85b3a542bdd6e205
-
---- a/tests/gtester2xunit.py
-+++ b/tests/gtester2xunit.py
-@@ -1,18 +1,17 @@
--#! /usr/bin/python
-+#! /usr/bin/python3
- from argparse import ArgumentParser
--import libxslt
--import libxml2
-+from lxml import etree
- import sys
- import os
- 
- XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl'
- 
- def transform_file(input_filename, output_filename, xsl_file):
--    gtester = libxml2.parseFile(xsl_file)
--    style = libxslt.parseStylesheetDoc(gtester)
--    doc = libxml2.parseFile(input_filename)
--    result = style.applyStylesheet(doc, None)
--    result.saveFormatFile(filename=output_filename, format=True)
-+    gtester = etree.parse(xsl_file)
-+    transform = etree.XSLT(gtester)
-+    doc = etree.parse(input_filename)
-+    result = transform(doc)
-+    result.write(output_filename)
- 
- 
- def get_output_filename(input_filename):
---- a/configure.ac
-+++ b/configure.ac
-@@ -109,11 +109,11 @@
- # gtester2xunit checks    #
- ###########################
- 
--AC_PATH_PROG([PYTHON],[python])
-+AC_PATH_PROG([PYTHON],[python3])
- AC_MSG_CHECKING(for gtester2xunit dependencies)
--if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then
-+if !($PYTHON -c "from lxml import etree" 2> /dev/null); then
-   AC_MSG_RESULT([no])
--  AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]);
-+  AC_MSG_ERROR([You need to install python3-lxml]);
- fi
- AC_MSG_RESULT([yes])
- 
diff --git a/src/bamf-view.c b/src/bamf-view.c
index 89faec1..08f06bd 100644
--- a/src/bamf-view.c
+++ b/src/bamf-view.c
@@ -92,8 +92,8 @@ on_active_changed_idle (gpointer data)
   BamfView *self = BAMF_VIEW (data);
   gboolean active = bamf_view_is_active (self);
 
-  g_signal_emit_by_name (self, "active-changed", active);
   self->priv->active_changed_idle = 0;
+  g_signal_emit_by_name (self, "active-changed", active);
 
   return FALSE;
 }
@@ -157,8 +157,8 @@ on_starting_timeout (gpointer data)
 {
   BamfView *view = data;
 
-  bamf_view_set_starting (view, NULL, FALSE);
   view->priv->starting_timeout = 0;
+  bamf_view_set_starting (view, NULL, FALSE);
 
   return FALSE;
 }