[evolution/gnome-3-26] Bug 789009 - Inbox is not expanded automatically on restart

[Milan Crha <mcrha src gnome org>]

commit 1772d4ee394776f03d9e31fbb5e69383c4c46b2e
Author: Michael Kuhn <suraia ikkoku de>
Date:   Tue Oct 17 15:39:02 2017 +0200

    Bug 789009 - Inbox is not expanded automatically on restart

 src/mail/em-folder-tree-model.c |    1 +
 src/mail/em-folder-tree.c       |   11 -----------
 2 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/src/mail/em-folder-tree-model.c b/src/mail/em-folder-tree-model.c
index 7ab81ec..a1d2b74 100644
--- a/src/mail/em-folder-tree-model.c
+++ b/src/mail/em-folder-tree-model.c
@@ -1336,6 +1336,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
                        -1);
 
                path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), iter);
+               g_signal_emit (model, signals[LOADED_ROW], 0, path, iter);
                g_signal_emit (model, signals[LOADING_ROW], 0, path, iter);
                gtk_tree_path_free (path);
                return;
diff --git a/src/mail/em-folder-tree.c b/src/mail/em-folder-tree.c
index 8117227..2314b5e 100644
--- a/src/mail/em-folder-tree.c
+++ b/src/mail/em-folder-tree.c
@@ -95,7 +95,6 @@ struct _EMFolderTreePrivate {
        guint autoexpand_id;
        GtkTreeRowReference *autoexpand_row;
 
-       guint loading_row_id;
        guint loaded_row_id;
        guint row_changed_id;
 
@@ -1209,11 +1208,6 @@ folder_tree_dispose (GObject *object)
                priv->loaded_row_id = 0;
        }
 
-       if (priv->loading_row_id != 0) {
-               g_signal_handler_disconnect (model, priv->loading_row_id);
-               priv->loading_row_id = 0;
-       }
-
        if (priv->row_changed_id != 0) {
                g_signal_handler_disconnect (model, priv->row_changed_id);
                priv->row_changed_id = 0;
@@ -1297,11 +1291,6 @@ folder_tree_constructed (GObject *object)
        selection = gtk_tree_view_get_selection (tree_view);
 
        handler_id = g_signal_connect (
-               model, "loading-row",
-               G_CALLBACK (folder_tree_maybe_expand_row), object);
-       priv->loading_row_id = handler_id;
-
-       handler_id = g_signal_connect (
                model, "loaded-row",
                G_CALLBACK (folder_tree_maybe_expand_row), object);
        priv->loaded_row_id = handler_id;