[evolution-rss] fix gconf migration

[Lucian Langa <lucilanga src gnome org>]

commit deafe85a932d9decea714cf2cc5a3524fcee3539
Author: Lucian Langa <lucilanga gnome org>
Date:   Mon Sep 3 17:13:14 2012 +0200

    fix gconf migration

 src/evolution-rss.convert                          |   51 ++++++++++----------
 ...e.evolution.plugin.evolution-rss.gschema.xml.in |    2 +-
 src/rss.h                                          |    2 +-
 3 files changed, 27 insertions(+), 28 deletions(-)
---
diff --git a/src/evolution-rss.convert b/src/evolution-rss.convert
index 15bb973..973ea3d 100644
--- a/src/evolution-rss.convert
+++ b/src/evolution-rss.convert
@@ -1,29 +1,28 @@
 [org.gnome.evolution]
 version = /apps/evolution/version
-last-upgraded-version = /apps/evolution/last_version
 
-[org.gnome.evolution.plugin.evolution-rss]
-display-summary = /apps/evolution/plugin/evolution-rss/display_summary
-accept-cookies = /apps/evolution/plugin/evolution-rss/accept_cookies
-download-enclosures = /apps/evolution/plugin/evolution-rss/download_enclosures
-enclosure-limit = /apps/evolution/plugin/evolution-rss/enclosure_limit
-enclosure-size = /apps/evolution/plugin/evolution-rss/enclosure_size
-remove-folder = /apps/evolution/plugin/evolution-rss/remove_folder
-custom-font = /apps/evolution/plugin/evolution-rss/custom_font
-min-font-size = /apps/evolution/plugin/evolution-rss/min_font_size
-html-render = /apps/evolution/plugin/evolution-rss/html_render
-html-js = /apps/evolution/plugin/evolution-rss/html_js
-html-java = /apps/evolution/plugin/evolution-rss/html_java
-embed-plugin = /apps/evolution/plugin/evolution-rss/embed_plugin
-status-icon = /apps/evolution/plugin/evolution-rss/status_icon
-blink-icon = /apps/evolution/plugin/evolution-rss/blink_icon
-startup-check = /apps/evolution/plugin/evolution-rss/startup_check
-rep-check = /apps/evolution/plugin/evolution-rss/rep_check
-rep-check-timeout = /apps/evolution/plugin/evolution-rss/rep_check_timeout
-image-resize = /apps/evolution/plugin/evolution-rss/image_resize
-search-rss = /apps/evolution/plugin/evolution-rss/search_rss
-feed-icon = /apps/evolution/plugin/evolution-rss/feed_icon
-show-comments = /apps/evolution/plugin/evolution-rss/show_comments
-network-timeout = /apps/evolution/plugin/evolution-rss/network_timeout
-network-queue-size = /apps/evolution/plugin/evolution-rss/network_queue_size
-feeds = /apps/evolution/plugin/evolution-rss/feeds
+[org.gnome.evolution.plugin.rss]
+display-summary = /apps/evolution/evolution-rss/display_summary
+accept-cookies = /apps/evolution/evolution-rss/accept_cookies
+download-enclosures = /apps/evolution/evolution-rss/download_enclosures
+enclosure-limit = /apps/evolution/evolution-rss/enclosure_limit
+enclosure-size = /apps/evolution/evolution-rss/enclosure_size
+remove-folder = /apps/evolution/evolution-rss/remove_folder
+custom-font = /apps/evolution/evolution-rss/custom_font
+min-font-size = /apps/evolution/evolution-rss/min_font_size
+html-render = /apps/evolution/evolution-rss/html_render
+html-js = /apps/evolution/evolution-rss/html_js
+html-java = /apps/evolution/evolution-rss/html_java
+embed-plugin = /apps/evolution/evolution-rss/embed_plugin
+status-icon = /apps/evolution/evolution-rss/status_icon
+blink-icon = /apps/evolution/evolution-rss/blink_icon
+startup-check = /apps/evolution/evolution-rss/startup_check
+rep-check = /apps/evolution/evolution-rss/rep_check
+rep-check-timeout = /apps/evolution/evolution-rss/rep_check_timeout
+image-resize = /apps/evolution/evolution-rss/image_resize
+search-rss = /apps/evolution/evolution-rss/search_rss
+feed-icon = /apps/evolution/evolution-rss/feed_icon
+show-comments = /apps/evolution/evolution-rss/show_comments
+network-timeout = /apps/evolution/evolution-rss/network_timeout
+network-queue-size = /apps/evolution/evolution-rss/network_queue_size
+feeds = /apps/evolution/evolution-rss/feeds
diff --git a/src/org.gnome.evolution.plugin.evolution-rss.gschema.xml.in b/src/org.gnome.evolution.plugin.evolution-rss.gschema.xml.in
index 4461841..27ceb5c 100644
--- a/src/org.gnome.evolution.plugin.evolution-rss.gschema.xml.in
+++ b/src/org.gnome.evolution.plugin.evolution-rss.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema path="/org/gnome/evolution/plugin/rss/" id="org.gnome.evolution.plugin.evolution-rss" gettext-domain="evolution">
+  <schema path="/org/gnome/evolution/plugin/rss/" id="org.gnome.evolution.plugin.rss" gettext-domain="evolution">
     <key name="auth-proxy" type="b">
       <default>false</default>
       <summary>Proxy requires authentication</summary>
diff --git a/src/rss.h b/src/rss.h
index 8dd336f..1f4d458 100644
--- a/src/rss.h
+++ b/src/rss.h
@@ -201,7 +201,7 @@ typedef struct _rssfeed {
 #define GCONF_KEY_IMAGE_RESIZE "/apps/evolution/evolution-rss/image_resize"
 #define GCONF_KEY_SEARCH_RSS "/apps/evolution/evolution-rss/search_rss"
 #else
-#define RSS_CONF_SCHEMA "org.gnome.evolution.plugin.evolution-rss"
+#define RSS_CONF_SCHEMA "org.gnome.evolution.plugin.rss"
 #define CONF_DISPLAY_SUMMARY "display-summary"
 #define CONF_ACCEPT_COOKIES "accept-cookies"
 #define CONF_DOWNLOAD_ENCLOSURES "download-enclosures"