[evolution-rss] adapt to Camel changes

[Lucian Langa <lucilanga src gnome org>]

commit 87ae939abd5ef896130bab49d84660309a1826d1
Author: Lucian Langa <lucilanga gnome org>
Date:   Wed Oct 9 22:32:38 2013 +0200

    adapt to Camel changes

 src/rss-config-factory.c |    4 ++++
 src/rss-image.c          |    4 ++++
 src/rss.c                |   19 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index 10b4301..84a1d6e 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -1273,7 +1273,11 @@ rss_delete_folders (CamelStore *store,
 
        d("call rss_delete_rec()\n");
        rss_delete_rec (store, fi, error);
+#if (DATASERVER_VERSION >= 3011001)
+       camel_folder_info_free (fi);
+#else
        camel_store_free_folder_info (store, fi);
+#endif
 }
 
 void
diff --git a/src/rss-image.c b/src/rss-image.c
index 5169cb2..12ab7fc 100644
--- a/src/rss-image.c
+++ b/src/rss-image.c
@@ -509,7 +509,11 @@ display_folder_icon(GtkTreeStore *tree_store, gchar *key)
                                COL_STRING_ICON_NAME, key,
                                -1);
                g_free(full_name);
+#if (DATASERVER_VERSION >= 3011001)
+               camel_folder_info_free (rssi);
+#else
                camel_store_free_folder_info (store, rssi);
+#endif
                g_object_unref(pixbuf);
                result = TRUE;
        }
diff --git a/src/rss.c b/src/rss.c
index 4c9b06b..1dcf192 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -4134,7 +4134,11 @@ create_mail(create_feed *CF)
        camel_object_unref(new);
        camel_object_unref(mail_folder);
 #endif
+#if (DATASERVER_VERSION >= 3011001)
+       camel_message_info_unref(info);
+#else
        camel_message_info_free(info);
+#endif
        g_free(buf);
 }
 
@@ -4593,7 +4597,12 @@ delete_oldest_article(CamelFolder *folder, guint unread)
                }
 //             d("uid:%d j:%d/%d, absdate:%d, date:%s, imax:%d\n",
 //                     i, j, q, min_date, ctime(&min_date), imax);
-out:           camel_message_info_free(info);
+out:
+#if (DATASERVER_VERSION >= 3011001)
+               camel_message_info_unref(info);
+#else
+               camel_message_info_free(info);
+#endif
        }
        camel_folder_freeze(folder);
        if (min_date) {
@@ -4689,7 +4698,11 @@ get_feed_age(RDF *r, gpointer name)
                                                feedid);
                                        g_free(feed_name);
                                }
+#if (DATASERVER_VERSION >= 3011001)
+                               camel_message_info_unref(info);
+#else
                                camel_folder_free_message_info(folder, info);
+#endif
                        }
 #if (DATASERVER_VERSION >= 2031001)
                        g_object_unref (message);
@@ -4728,7 +4741,11 @@ get_feed_age(RDF *r, gpointer name)
                                                }
                                }
                        }
+#if (DATASERVER_VERSION >= 3011001)
+                       camel_message_info_unref(info);
+#else
                        camel_folder_free_message_info(folder, info);
+#endif
                }
                camel_folder_free_uids (folder, uids);
 #if (DATASERVER_VERSION >= 2033001)