[evolution-data-server/gnome-3-16] Incorrect message info unreferenced in camel_vee_folder_get_location()

[Milan Crha <mcrha src gnome org>]

commit 658d6511f35b5083837b1e139a19b1967a9659a2
Author: Milan Crha <mcrha redhat com>
Date:   Fri Apr 24 07:03:10 2015 +0200

    Incorrect message info unreferenced in camel_vee_folder_get_location()
    
    This reverts commit 620812dd407de1b and adds a correct fix, unreference
    correct message info in camel_vee_folder_get_location().

 camel/camel-vee-folder.c  |    2 +-
 camel/camel-vee-summary.c |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 3b1d770..cb9c7a8 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -1602,7 +1602,7 @@ camel_vee_folder_get_location (CamelVeeFolder *vf,
 
                vfinfo = (CamelVeeMessageInfo *) camel_folder_get_message_info (folder, 
camel_message_info_uid (vinfo) + 8);
                res = camel_vee_folder_get_location ((CamelVeeFolder *) folder, vfinfo, realuid);
-               camel_message_info_unref ((CamelMessageInfo *) vinfo);
+               camel_message_info_unref ((CamelMessageInfo *) vfinfo);
                return res;
        } else {
                if (realuid)
diff --git a/camel/camel-vee-summary.c b/camel/camel-vee-summary.c
index d516c3b..a1ea8a8 100644
--- a/camel/camel-vee-summary.c
+++ b/camel/camel-vee-summary.c
@@ -293,9 +293,7 @@ message_info_from_uid (CamelFolderSummary *s,
        CamelMessageInfo *info;
 
        info = camel_folder_summary_peek_loaded (s, uid);
-       if (info) {
-               camel_message_info_ref (info);
-       } else {
+       if (!info) {
                CamelVeeMessageInfo *vinfo;
                CamelFolder *orig_folder;