[evolution/wip/webkit2] Bug 736824 - Status bar Cancel button image cut with certain themes

[Tomas Popela <tpopela src gnome org>]

commit 973f0b74772e8cf7586ca6d9c57e358d2141ac18
Author: Milan Crha <mcrha redhat com>
Date:   Wed Mar 4 17:24:00 2015 +0100

    Bug 736824 - Status bar Cancel button image cut with certain themes

 shell/e-shell-taskbar.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 0910ea9..53685cf 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -364,13 +364,16 @@ shell_taskbar_size_allocate (GtkWidget *widget,
                              GtkAllocation *allocation)
 {
        EShellTaskbar *shell_taskbar;
-       gint fixed_height;
+       gint fixed_height, minimum_height = 0, natural_height = 0;
+
+       if (GTK_WIDGET_CLASS (e_shell_taskbar_parent_class)->get_preferred_height)
+               GTK_WIDGET_CLASS (e_shell_taskbar_parent_class)->get_preferred_height (widget, 
&minimum_height, &natural_height);
 
        shell_taskbar = E_SHELL_TASKBAR (widget);
 
        /* Maximum height allocation sticks. */
        fixed_height = shell_taskbar->priv->fixed_height;
-       fixed_height = MAX (fixed_height, allocation->height);
+       fixed_height = MAX (fixed_height, MAX (allocation->height, minimum_height));
        shell_taskbar->priv->fixed_height = fixed_height;
 
        /* Chain up to parent's size_allocate() method. */