[evolution-rss] misc cleanups and fix evo defines
- From: Lucian Langa <lucilanga src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-rss] misc cleanups and fix evo defines
- Date: Wed, 29 Jul 2009 17:54:22 +0000 (UTC)
commit e4d929a219831f24f22c89563e7886cc3b2f14c8
Author: Lucian Langa <lucilanga gnome org>
Date: Wed Jul 29 20:44:38 2009 +0300
misc cleanups and fix evo defines
depcomp | 589 -------------------------------------------------------
install-sh | 519 ------------------------------------------------
missing | 367 ----------------------------------
mkinstalldirs | 161 ---------------
src/Makefile.am | 4 +
src/parser.c | 1 +
src/rss.c | 5 +-
7 files changed, 9 insertions(+), 1637 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index aca07a5..3597213 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,9 +144,13 @@ EXTRA_DIST = \
$(schema_in_files) \
rss.h network.h \
network-soup.c \
+ network-soup.h \
misc.c \
+ misc.h \
dbus.c \
+ dbus.h \
fetch.c \
+ fetch.h \
file-gio.c \
file-gio.h \
gecko-utils.cpp \
diff --git a/src/parser.c b/src/parser.c
index 9badd48..9e4b044 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -24,6 +24,7 @@
#include <libxml/HTMLparser.h>
#include <libxml/HTMLtree.h>
#include <libxml/debugXML.h>
+#include <camel/camel-url.h>
#include "fetch.h"
#include "rss.h"
diff --git a/src/rss.c b/src/rss.c
index e4f27e8..234c4e7 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -2257,10 +2257,11 @@ void org_gnome_cooly_folder_icon(void *ep, EMEventTargetCustomIcon *t)
if (!key)
goto normal;
+
+#if (EVOLUTION_VERSION >= 22703)
if (!evolution_store)
evolution_store = t->store;
-#if (EVOLUTION_VERSION >= 22703)
if (!(g_hash_table_lookup(icons, key))) {
#else
if (!(icon = g_hash_table_lookup(icons, key))) {
@@ -4654,6 +4655,7 @@ finish_create_icon_stream (SoupSession *soup_sess, SoupMessage *msg, FEED_IMAGE
g_free(user_data);
}
+#if (EVOLUTION_VERSION >= 22703)
gboolean
display_folder_icon(GtkTreeStore *tree_store, gchar *key)
{
@@ -4705,6 +4707,7 @@ out: g_free(img_file);
g_free(feed_dir);
return result;
}
+#endif
#define CAMEL_DATA_CACHE_BITS (6)
#define CAMEL_DATA_CACHE_MASK ((1<<CAMEL_DATA_CACHE_BITS)-1)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]