[geary/gnumdk/mail-merge-action-enabled: 4/4] client: Fix adding a new infobar to Components.InfoBarStack

[Cédric Bellegarde <cbellegarde src gnome org>]

commit 14d5a4f5102e5272b0e7fd22c1fca29deeb1cf44
Author: Cédric Bellegarde <cedric bellegarde adishatz org>
Date:   Sat Aug 27 20:48:18 2022 +0200

    client: Fix adding a new infobar to Components.InfoBarStack
    
    - Previous code was not removing current widget on unrevealing
    - Connect reveal signal on time, not for every infobar
    - Remove allocation management as it does not seem useful now

 .../components/components-info-bar-stack.vala      | 30 ++++------------------
 1 file changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/src/client/components/components-info-bar-stack.vala 
b/src/client/components/components-info-bar-stack.vala
index 83339210e..f80a04f90 100644
--- a/src/client/components/components-info-bar-stack.vala
+++ b/src/client/components/components-info-bar-stack.vala
@@ -155,7 +155,6 @@ public class Components.InfoBarStack : Gtk.Frame, Geary.BaseInterface {
     }
 
     private Gee.Queue<Components.InfoBar> available;
-    private int last_allocated_height = 0;
 
 
     construct {
@@ -212,19 +211,16 @@ public class Components.InfoBarStack : Gtk.Frame, Geary.BaseInterface {
             // so show it
             this.visible = true;
             base.add(next);
-            this.size_allocate.connect(on_allocation_changed);
             next.revealed = true;
-            next.notify["revealed"].connect(on_revealed);
         } else if (current != null && next != current) {
             // Currently showing an info bar but should be showing
             // something else, so start hiding it
-            current.notify["revealed"].disconnect(on_revealed);
+            current.notify["revealed"].connect(on_revealed);
             current.revealed = false;
         } else if (current == null && next == null) {
             // Not currently showing anything and there's nothing to
             // show, so hide the frame
             this.visible = false;
-            this.last_allocated_height = 0;
         }
     }
 
@@ -242,27 +238,11 @@ public class Components.InfoBarStack : Gtk.Frame, Geary.BaseInterface {
         update();
     }
 
-    private void on_allocation_changed() {
-        var current = this.current_info_bar;
-        if (current != null) {
-            Gtk.Allocation alloc;
-            get_allocation(out alloc);
-            bool shrinking = this.last_allocated_height > alloc.height;
-            this.last_allocated_height = alloc.height;
-            if (shrinking && alloc.height < 2) {
-                this.size_allocate.disconnect(on_allocation_changed);
-                this.available.remove(current);
-                base.remove(current);
-                update();
-            }
-        }
-    }
-
     private void on_revealed(GLib.Object target, GLib.ParamSpec param) {
-        var current = this.current_info_bar;
-        if (current == target && !current.revealed) {
-            remove(current);
-        }
+        var info_bar = target as Components.InfoBar;
+        target.notify["revealed"].disconnect(on_revealed);
+        base.remove(info_bar);
+        remove(info_bar);
     }
 
 }