[evolution-rss] Bug 651589 - Error regenerating POT file

[Lucian Langa <lucilanga src gnome org>]

commit 5a6a68adc9e7d2a09a0c6e319b3f06a04785f421
Author: Lucian Langa <lucilanga gnome org>
Date:   Thu Jun 16 21:55:58 2011 +0300

    Bug 651589 - Error regenerating POT file

 po/POTFILES.in                       |    2 +-
 po/POTFILES.skip                     |    1 +
 src/GNOME_Evolution_RSS.server.in.in |   39 ----------------------------------
 src/Makefile.am                      |   18 +--------------
 4 files changed, 3 insertions(+), 57 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index aea56a9..559cd7d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-evolution-rss.desktop
+evolution-rss.desktop.in.in
 src/dbus.c
 src/evolution-rss.schemas.in.in
 src/evolution-import-rss.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..b92ff92
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1 @@
+evolution-rss.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 4ba3640..1fdd6fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,20 +103,6 @@ schema_DATA	= $(schema_in_files:.schemas.in.in=.schemas)
 %.schemas.in: %.schemas.in.in
 	sed -e "s#\ bindir\@# bindir@#g" $< > $@
 
-server_in_files = GNOME_Evolution_RSS.server.in.in
-
-if HAVE_BONOBO
-server_DATA = $(server_in_files:.server.in.in=_$(EVOLUTION_EXEC_VERSION).server)
-	touch $(top_srcdir)/po/POTFILES.skip
-	sed -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.skip
-	sed -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
-	echo 'src/GNOME_Evolution_RSS.server.in.in' >> $(top_srcdir)/po/POTFILES.in
-else
-	sed -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
-	sed -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
-	echo 'src/GNOME_Evolution_RSS.server.in.in' > $(top_srcdir)/po/POTFILES.skip
-endif
-
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 @INTLTOOL_SCHEMAS_RULE@
@@ -154,18 +140,16 @@ ui_DATA =                    \
 	rss-main.ui		\
 	rss-html-rendering.ui
 
-BUILT_SOURCES	= $(server_DATA)
+#BUILT_SOURCES	= $(server_DATA)
 CLEANFILES	= $(BUILT_SOURCES)	\
 	org-gnome-evolution-rss.eplug	\
 	org-gnome-evolution-rss.error   \
-	GNOME_Evolution_RSS.server.in	\
 	evolution-rss.schemas		\
 	evolution-rss.schemas.in	\
 	$(schema_DATA)
 
 EXTRA_DIST =					\
 	$(ui_DATA)				\
-	$(server_in_files)			\
 	$(schema_in_files)			\
 	rss.h network.h				\
 	network-soup.c				\