[evolution] EColorCombo - Cannot choose a color from a popup palette

[Milan Crha <mcrha src gnome org>]

commit f1a0a347fda3f63bebf55daa16a21246ca50bc5d
Author: Milan Crha <mcrha redhat com>
Date:   Wed Mar 4 16:18:33 2015 +0100

    EColorCombo - Cannot choose a color from a popup palette
    
    It closed immediately, causing no way to select any color.

 e-util/e-color-combo.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-color-combo.c b/e-util/e-color-combo.c
index ea26388..ca3de89 100644
--- a/e-util/e-color-combo.c
+++ b/e-util/e-color-combo.c
@@ -269,9 +269,8 @@ color_combo_window_button_press_event_cb (EColorCombo *combo,
        if (combo->priv->popup_shown == TRUE)
                return FALSE;
 
-       color_combo_popup (combo);
-
        combo->priv->popup_in_progress = TRUE;
+       color_combo_popup (combo);
 
        return TRUE;
 }
@@ -364,6 +363,7 @@ color_combo_button_press_event_cb (GtkWidget *widget,
        if (combo->priv->popup_shown) {
                color_combo_popdown (combo);
        } else {
+               combo->priv->popup_in_progress = TRUE;
                color_combo_popup (combo);
        }