Move repo parse to config-gconf

diff --git a/src/config-gconf.c b/src/config-gconf.c
index 4df36f83d560f7f507ba2e6acb940b40502423ff..9810f135e1fa8832092679800bd2aa573c428a61 100644 (file)
--- a/src/config-gconf.c
+++ b/src/config-gconf.c
@@ -128,6 +128,60 @@ g_slist_free(temp_list);
 return TRUE;
 }
 
+RepoData *
+config_parse_repo(gchar * str)
+{
+       /* Parse each part of a repo, delimited by newline characters:
+        * 1. name
+        * 2. url
+        * 3. cache_dir
+        * 4. dl_zoom_steps
+        * 5. view_zoom_steps
+        */
+gchar *token, *error_check;
+
+RepoData *rd = g_new0(RepoData, 1);
+
+/* Parse name. */
+token = strsep(&str, "\n\t");
+if (token)
+       rd->name = g_strdup(token);
+
+/* Parse URL format. */
+token = strsep(&str, "\n\t");
+if (token)
+       rd->url = g_strdup(token);
+
+/* Parse cache dir. */
+token = strsep(&str, "\n\t");
+if (token)
+       rd->cache_dir = gnome_vfs_expand_initial_tilde(token);
+
+/* Parse download zoom steps. */
+token = strsep(&str, "\n\t");
+if (!token || !*token || !(rd->dl_zoom_steps = atoi(token)))
+       rd->dl_zoom_steps = 2;
+
+/* Parse view zoom steps. */
+token = strsep(&str, "\n\t");
+if (!token || !*token || !(rd->view_zoom_steps = atoi(token)))
+       rd->view_zoom_steps = 1;
+
+/* Parse double-size. */
+token = strsep(&str, "\n\t");
+if (token)
+       rd->double_size = atoi(token);  /* Default is zero (FALSE) */
+
+/* Parse next-able. */
+token = strsep(&str, "\n\t");
+if (!token || !*token
+    || (rd->nextable = strtol(token, &error_check, 10), token == str))
+               rd->nextable = TRUE;
+
+set_repo_type(rd);
+return rd;
+}
+
 static void
 config_default_repo(void)
 {

diff --git a/src/config-gconf.h b/src/config-gconf.h
index c8e3be5dcacc058e862a180c0073806197e39193..f48d9a47b42c50c47fdc547654cc28d2deac8ad7 100644 (file)
--- a/src/config-gconf.h
+++ b/src/config-gconf.h
@@ -3,12 +3,14 @@
 
 #include <gconf/gconf-client.h>
 #include "filter.h"
+#include "mapper-types.h"
 
 GConfClient *gconf_client;
 
 void config_init(void);
 gboolean config_save_repo(void);
 gboolean config_load_repo(void);
+RepoData *config_parse_repo(gchar *str);
 gboolean config_save_home(void);
 gboolean config_save(void);
 void config_update_proxy(void);

diff --git a/src/map-repo.c b/src/map-repo.c
index e5a8d90fcecc92eb2a6d5df637cf9743b5481f4f..083d34a5727765f5d91fc7171050de85176d01f2 100644 (file)
--- a/src/map-repo.c
+++ b/src/map-repo.c
@@ -119,60 +119,6 @@ if (repo->url && *repo->url) {
        repo->type = REPOTYPE_NONE;
 }
 
-RepoData *
-config_parse_repo(gchar * str)
-{
-       /* Parse each part of a repo, delimited by newline characters:
-        * 1. name
-        * 2. url
-        * 3. cache_dir
-        * 4. dl_zoom_steps
-        * 5. view_zoom_steps
-        */
-gchar *token, *error_check;
-
-RepoData *rd = g_new0(RepoData, 1);
-
-/* Parse name. */
-token = strsep(&str, "\n\t");
-if (token)
-       rd->name = g_strdup(token);
-
-/* Parse URL format. */
-token = strsep(&str, "\n\t");
-if (token)
-       rd->url = g_strdup(token);
-
-/* Parse cache dir. */
-token = strsep(&str, "\n\t");
-if (token)
-       rd->cache_dir = gnome_vfs_expand_initial_tilde(token);
-
-/* Parse download zoom steps. */
-token = strsep(&str, "\n\t");
-if (!token || !*token || !(rd->dl_zoom_steps = atoi(token)))
-       rd->dl_zoom_steps = 2;
-
-/* Parse view zoom steps. */
-token = strsep(&str, "\n\t");
-if (!token || !*token || !(rd->view_zoom_steps = atoi(token)))
-       rd->view_zoom_steps = 1;
-
-/* Parse double-size. */
-token = strsep(&str, "\n\t");
-if (token)
-       rd->double_size = atoi(token);  /* Default is zero (FALSE) */
-
-/* Parse next-able. */
-token = strsep(&str, "\n\t");
-if (!token || !*token
-    || (rd->nextable = strtol(token, &error_check, 10), token == str))
-               rd->nextable = TRUE;
-
-set_repo_type(rd);
-return rd;
-}
-
 gboolean
 repo_make_cache_dir(gchar * name, const gchar * cache_dir, GtkWidget * parent)
 {