[evolution-rss] more defines fixes

[Lucian Langa <lucilanga src gnome org>]

commit 47b1995a0e9e6775fed324aa023aa951e6f6ca55
Author: Lucian Langa <lucilanga gnome org>
Date:   Sat Sep 19 21:17:56 2009 +0300

    more defines fixes

 src/rss-config-factory.c |    2 +-
 src/rss.c                |    2 +-
 src/rss.h                |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index 06ea423..eade826 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -1713,11 +1713,11 @@ static void
 construct_opml_line(gpointer key, gpointer value, gpointer user_data)
 {
         gchar *url = g_hash_table_lookup(rf->hr, value);
-        gchar *type = g_hash_table_lookup(rf->hrt, value);
         gchar *url_esc = g_markup_escape_text(url, strlen(url));
         gchar *key_esc = g_markup_escape_text(key, strlen(key));
 
 #if 0
+        gchar *type = g_hash_table_lookup(rf->hrt, value);
 CamelFolderInfo *info;
 	CamelStore *store = mail_component_peek_local_store(NULL);
         CamelException ex;
diff --git a/src/rss.c b/src/rss.c
index 2e2ae29..65ffd03 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -2496,7 +2496,7 @@ void org_gnome_cooly_folder_refresh(void *ep, EShellView *shell_view)
 	EMFolderTree *folder_tree;
         CamelFolder *folder;
 	EShellSidebar *shell_sidebar = e_shell_view_get_shell_sidebar(shell_view);
-	folder_tree = e_mail_shell_sidebar_get_folder_tree (shell_sidebar);
+	g_object_get (shell_sidebar, "folder-tree", &folder_tree, NULL);
         folder = em_folder_tree_get_selected_folder (folder_tree);
         g_return_if_fail (folder != NULL);
 	folder_name = folder->full_name;
diff --git a/src/rss.h b/src/rss.h
index ff72f39..d7111ab 100644
--- a/src/rss.h
+++ b/src/rss.h
@@ -31,7 +31,7 @@
 
 #include <gtk/gtk.h>
 #include <libsoup/soup.h>
-#if EVOLUTION_VERSION < 22800 //kb//
+#if EVOLUTION_VERSION < 22900 //kb//
 #include <mail/mail-component.h>
 #endif
 
@@ -352,7 +352,7 @@ void taskbar_push_message(gchar *message);
 void taskbar_pop_message(void);
 void write_feeds_folder_line(gpointer key, gpointer value, FILE *file);
 void populate_reversed(gpointer key, gpointer value, GHashTable *hash);
-#if EVOLUTION_VERSION < 22800 //kb//
+#if EVOLUTION_VERSION < 22900 //kb//
 gchar *rss_component_peek_base_directory(MailComponent *component);
 #else
 gchar *rss_component_peek_base_directory(void);