[evolution-rss] add correct schema name for rss feeds to gconf

[Lucian Langa <lucilanga src gnome org>]

commit d77974a83d83d1dca4e192c129e8a7e9d131b025
Author: Lucian Langa <lucilanga gnome org>
Date:   Wed Feb 3 22:24:39 2010 +0200

    add correct schema name for rss feeds to gconf

 TODO                                               |    6 +----
 src/Makefile.am                                    |   26 +++++++++++++-------
 ...-rss.schemas.in => evolution-rss.schemas.in.in} |   14 +++++-----
 3 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/TODO b/TODO
index df6d286..2667c81 100644
--- a/TODO
+++ b/TODO
@@ -9,9 +9,7 @@
 	* when adding a feed as opml file offer to import (file detection)
 	* run-time migration function from text/evolution-rss-feed -> x-evolution/evolution-rss-feed
 	* cache large feeds
-	* if necessary implement config code for evo 2.12
 	* fix recursivity on layer_find_pos
-	* fix annoying cursor jump when browsing through evo-rss folders
 	* provide predefined groups of feeds (OSS & co)
 	* evolution import rss add no. of retries
 	* slow delete operation on large folders
@@ -21,8 +19,6 @@
 	* check webbuttons for webkit
 	* cancel operation should cancel fetching feed components
 	* perhaps make quoted text fancier
-	* disable filters on setup_feed()
-	* migrate fetch_blocking -> fetch_unblocking
 	* grey out disabled folders (feeds)
 	* feed check runtime validation
 	* wrong send and receive count of articles after import
@@ -48,4 +44,4 @@
 	* Delete artcles no longer in the feed should be a checkbox
 	* when import opml print opml title
 	* add configure option when import for searching rss in the html page
-	* import withouth fetching
+	* import withouth fetching (add without validate ?)
diff --git a/src/Makefile.am b/src/Makefile.am
index 291e300..a5ac7c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,10 +32,10 @@ RSS_MENU = \
 	<hook class=\"org.gnome.evolution.mail.bonobomenu:1.0\">\n		\
 		<menu target=\"select\" id=\"org.gnome.evolution.mail.browser\">\n	\
 	\n								\
-      <ui file=\"+PLUGIN_INSTALL_DIR+/org-gnome-evolution-rss.xml\"/>\n	\
-          <item verb=\"RSSTask\" type=\"item\" path=\"/commands/RSSTask\" activate=\"org_gnome_cooly_rss_refresh\"/>\n		\
-        </menu>\n \
-    </hook>
+	<ui file=\"+PLUGIN_INSTALL_DIR+/org-gnome-evolution-rss.xml\"/>\n	\
+		<item verb=\"RSSTask\" type=\"item\" path=\"/commands/RSSTask\" activate=\"org_gnome_cooly_rss_refresh\"/>\n		\
+		</menu>\n \
+		</hook>
 
 %.eplug.in.in: %.eplug.xml
 	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
@@ -100,8 +100,11 @@ evolution_import_rss_LDFLAGS = $(DBUS_LIBS)
 
 
 schemadir	= $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = evolution-rss.schemas.in
-schema_DATA	= $(schema_in_files:.schemas.in=.schemas)
+schema_in_files = evolution-rss.schemas.in.in
+schema_DATA	= $(schema_in_files:.schemas.in.in=.schemas)
+%.schema.in: %.schemas.in.in
+	sed -e "s#\ bindir\@# bindir@#g" $< > $@
+
 
 if HAVE_BONOBO
 server_in_files = GNOME_Evolution_RSS.server.in.in
@@ -130,6 +133,9 @@ 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
+	$(GCONFTOOL) -u /gnome/url-handlers/feed/command
+	$(GCONFTOOL) -u /gnome/url-handlers/feed/enabled
+	$(GCONFTOOL) -u /gnome/url-handlers/feed/need-terminal
 
 
 DISTCLEANFILES = $(schema_DATA)
@@ -143,12 +149,14 @@ CLEANFILES	= $(BUILT_SOURCES)	\
 	org-gnome-evolution-rss.eplug	\
 	org-gnome-evolution-rss.error   \
 	GNOME_Evolution_RSS.server.in	\
-	evolution-rss.schemas
+	evolution-rss.schemas		\
+	evolution-rss.schemas.in	\
+	$(schema_DATA)
 
 EXTRA_DIST =					\
 	$(glade_DATA)				\
 	$(server_in_files)			\
-        $(schema_in_files)			\
+	$(schema_in_files)			\
 	rss.h network.h				\
 	network-soup.c				\
 	network-soup.h				\
@@ -170,7 +178,7 @@ EXTRA_DIST =					\
 	rss-icon-factory.h			\
 	strptime.c				\
 	evolution-import-rss.c			\
-	evolution-rss.schemas.in		\
+	evolution-rss.schemas.in.in		\
 	org-gnome-evolution-rss.eplug.xml	\
 	org-gnome-evolution-rss.error.xml	\
 	org-gnome-evolution-rss.xml
diff --git a/src/evolution-rss.schemas.in b/src/evolution-rss.schemas.in.in
similarity index 95%
rename from src/evolution-rss.schemas.in
rename to src/evolution-rss.schemas.in.in
index 87d46cf..0b69740 100644
--- a/src/evolution-rss.schemas.in
+++ b/src/evolution-rss.schemas.in.in
@@ -328,8 +328,8 @@
 
 
 <schema>
-     <key>/schemas/desktop/gnome/url-handlers/rss/enabled</key>
-     <applyto>/desktop/gnome/url-handlers/rss/enabled</applyto>
+     <key>/schemas/desktop/gnome/url-handlers/feed/enabled</key>
+     <applyto>/desktop/gnome/url-handlers/feed/enabled</applyto>
      <owner>evolution-rss</owner>
      <type>bool</type>
      <default>true</default>
@@ -340,11 +340,11 @@
 </schema>
 
    <schema>
-     <key>/schemas/desktop/gnome/url-handlers/rss/command</key>
-     <applyto>/desktop/gnome/url-handlers/rss/command</applyto>
+     <key>/schemas/desktop/gnome/url-handlers/feed/command</key>
+     <applyto>/desktop/gnome/url-handlers/feed/command</applyto>
      <owner>evolution-rss</owner>
      <type>string</type>
-     <default>@bindir@/evolution-rss %s</default>
+     <default>@bindir@/evolution-import-rss %s</default>
      <locale name="C">
        <short>URL handler for rss feed uris</short>
        <long>URL handler for rss feed uris</long>
@@ -352,8 +352,8 @@
     </schema>
 
    <schema>
-     <key>/schemas/desktop/gnome/url-handlers/rss/need-terminal</key>
-     <applyto>/desktop/gnome/url-handlers/rss/need-terminal</applyto>
+     <key>/schemas/desktop/gnome/url-handlers/feed/need-terminal</key>
+     <applyto>/desktop/gnome/url-handlers/feed/need-terminal</applyto>
      <owner>evolution-rss</owner>
      <type>bool</type>
      <default>false</default>