[evolution/gnome-3-20] EHTMLEditorImageDialog - Border and alignment are not set properly

[Tomas Popela <tpopela src gnome org>]

commit c83c78e9ecedc289528242c982db250f68081ca4
Author: Tomas Popela <tpopela redhat com>
Date:   Wed May 11 10:15:54 2016 +0200

    EHTMLEditorImageDialog - Border and alignment are not set properly

 e-util/e-html-editor-image-dialog.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/e-util/e-html-editor-image-dialog.c b/e-util/e-html-editor-image-dialog.c
index eaeea5f..5eb7909 100644
--- a/e-util/e-html-editor-image-dialog.c
+++ b/e-util/e-html-editor-image-dialog.c
@@ -427,6 +427,16 @@ html_editor_image_dialog_show (GtkWidget *widget)
                GTK_COMBO_BOX (dialog->priv->height_units), "units-px");
 
        tmp = webkit_dom_html_image_element_get_border (dialog->priv->image);
+       if (tmp && *tmp) {
+               gint border;
+
+               border = atoi (tmp);
+               gtk_spin_button_set_value (
+                       GTK_SPIN_BUTTON (dialog->priv->border_edit), border);
+       }
+       g_free (tmp);
+
+       tmp = webkit_dom_html_image_element_get_align (dialog->priv->image);
        gtk_combo_box_set_active_id (
                GTK_COMBO_BOX (dialog->priv->alignment),
                (tmp && *tmp) ? tmp : "bottom");