[evolution-rss] Fix for bug #580116

[Lucian Langa <lucilanga src gnome org>]

commit 9ff94d6c2386d664e54fbded60911d383220093f
Author: Lucian Langa <lucilanga gnome org>
Date:   Fri Apr 24 19:55:39 2009 +0300

    Fix for bug #580116
---
 .gitignore          |   36 ------------------------------------
 ChangeLog           |    6 ++++++
 Makefile.am         |    2 ++
 Makefile.in         |    2 ++
 pixmaps/Makefile.am |    2 ++
 pixmaps/Makefile.in |    2 ++
 src/Makefile.am     |    2 ++
 src/Makefile.in     |    2 ++
 src/parser.c        |    1 +
 9 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index cf51957..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-*~
-Makefile
-compile
-config.h
-config.log
-config.status
-configure
-evolution-rss.spec
-libtool
-stamp-h1
-autom4te.cache/
-src/.deps
-src/.libs
-po/*.gmo
-po/stamp-it
-po/.intltool-merge-cache
-po/Makefile
-po/Makefile.in
-po/Makefile.in.in
-po/POTFILES
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-pixmaps/Makefile
-src/GNOME_Evolution_RSS_2.26.server
-src/Makefile
-src/evolution-import-rss
-src/evolution-import-rss.o
-src/evolution-rss.schemas
-src/org-gnome-evolution-rss.eplug
-src/org-gnome-evolution-rss.error
-src/*.la
-src/*.lo
-
diff --git a/ChangeLog b/ChangeLog
index ce98dd7..0a91db6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-24  Lucian Langa  <lucilanga gnome org>
+
+	Fix for #580116:
+
+	* src/parser.c (parse_channel_line): strip feed id
+
 2009-04-22  Fridrich Strba  <fridrich strba bluewin ch>
 
 	* src/misc.c (santize_url): change to g_filename_to_uri
diff --git a/Makefile.am b/Makefile.am
index 096db90..4c964de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,5 @@ DISTCLEANFILES = \
   intltool-extract \
   intltool-merge \
   intltool-update
+
+-include $(top_srcdir)/git.mk
diff --git a/Makefile.in b/Makefile.in
index 9eacf68..8499f04 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -751,6 +751,8 @@ uninstall-am:
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am
 
+
+-include $(top_srcdir)/git.mk
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 26e74e5..24e0d5f 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -14,3 +14,5 @@ pixmap_DATA =   pix.png		\
 
 EXTRA_DIST = $(pixmap_DATA)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in
index 811111e..4a5d5b5 100644
--- a/pixmaps/Makefile.in
+++ b/pixmaps/Makefile.in
@@ -460,6 +460,8 @@ uninstall-am: uninstall-pixmapDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-pixmapDATA
 
+
+-include $(top_srcdir)/git.mk
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/Makefile.am b/src/Makefile.am
index 8109973..4f246c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -160,3 +160,5 @@ else
 DBD=0
 endif
 
+
+-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.in b/src/Makefile.in
index 121aef4..279471d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -880,6 +880,8 @@ uninstall-local:
 	$(GCONFTOOL) -u /apps/evolution/evolution-rss/user_proxy
 	$(GCONFTOOL) -u /apps/evolution/evolution-rss/port_proxy
 	$(GCONFTOOL) -u /apps/evolution/evolution-rss/display_summary
+
+-include $(top_srcdir)/git.mk
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/parser.c b/src/parser.c
index 6b8a03e..db5d8c4 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -972,6 +972,7 @@ parse_channel_line(xmlNode *top, gchar *feed_name, char *main_date)
 		char *id = layer_find (top, "id",				//ATOM
 				layer_find (top, "guid", NULL));		//RSS 2.0
 		feed = g_strdup_printf("%s\n", id ? id : link);
+		g_strstrip(feed);
 		d(g_print("link:%s\n", link));
 		d(g_print("author:%s\n", q));
 		d(g_print("title:%s\n", p));