[evolution-rss] Trying to replace the relevant occurences of "/" by G_DIR_SEPARATOR_S



commit dd59eb26813cb5034cc2116e2a73db4a9ced806a
Author: Fridrich Å trba <fridrich strba bluewin ch>
Date:   Sun Apr 11 02:33:24 2010 +0200

    Trying to replace the relevant occurences of "/" by G_DIR_SEPARATOR_S

 src/network-soup.c       |    8 ++++----
 src/parser.c             |    2 +-
 src/rss-cache.c          |    2 +-
 src/rss-config-factory.c |   14 +++++++-------
 src/rss.c                |   16 ++++++++--------
 5 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/src/network-soup.c b/src/network-soup.c
index 7da5bd8..bda202d 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -932,8 +932,8 @@ sync_gecko_cookies(void)
 	//symlink(cookie_path, moz_cookie_path);
 	GFile *cookie_file, *moz_cookie_file;
 	gchar *feed_dir = rss_component_peek_base_directory();
-	gchar *cookie_path = g_build_path("/", feed_dir, "rss-cookies.sqlite", NULL);
-	gchar *moz_cookie_path = g_build_path("/", feed_dir, "mozembed-rss", "cookies.sqlite", NULL);
+	gchar *cookie_path = g_build_path(G_DIR_SEPARATOR_S, feed_dir, "rss-cookies.sqlite", NULL);
+	gchar *moz_cookie_path = g_build_path(G_DIR_SEPARATOR_S, feed_dir, "mozembed-rss", "cookies.sqlite", NULL);
 
 	cookie_file = g_file_new_for_path (cookie_path);
 	moz_cookie_file = g_file_new_for_path (moz_cookie_path);
@@ -950,8 +950,8 @@ rss_soup_init(void)
 #if LIBSOUP_VERSION > 2026002 && defined(HAVE_LIBSOUP_GNOME)
 	if (gconf_client_get_bool (rss_gconf, GCONF_KEY_ACCEPT_COOKIES, NULL)) {
 		gchar *feed_dir = rss_component_peek_base_directory();
-		gchar *cookie_path = g_build_path("/", feed_dir, "rss-cookies.sqlite", NULL);
-		gchar *moz_cookie_path = g_build_path("/", feed_dir, "mozembed-rss", "cookies.sqlite", NULL);
+		gchar *cookie_path = g_build_path(G_DIR_SEPARATOR_S, feed_dir, "rss-cookies.sqlite", NULL);
+		gchar *moz_cookie_path = g_build_path(G_DIR_SEPARATOR_S, feed_dir, "mozembed-rss", "cookies.sqlite", NULL);
 		g_free(feed_dir);
 
 		rss_soup_jar =
diff --git a/src/parser.c b/src/parser.c
index 0f64551..3201a66 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -64,7 +64,7 @@ rss_html_url_decode(const char *html, int len)
 
 	doc = src;
 
-	feed_dir = g_build_path("/",
+	feed_dir = g_build_path(G_DIR_SEPARATOR_S,
 		base_dir,
 		"static",
 		"http",
diff --git a/src/rss-cache.c b/src/rss-cache.c
index 421aefb..20696aa 100644
--- a/src/rss-cache.c
+++ b/src/rss-cache.c
@@ -41,7 +41,7 @@ rss_cache_init(void)
 	gchar *base_dir, *feed_dir;
 
 	base_dir = rss_component_peek_base_directory();
-	feed_dir = g_build_path("/",
+	feed_dir = g_build_path(G_DIR_SEPARATOR_S,
 			base_dir,
 			"static",
 			NULL);
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index b3be961..ebe8fdf 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -525,7 +525,7 @@ build_dialog_add(gchar *url, gchar *feed_text)
 	entry2 = GTK_WIDGET (gtk_builder_get_object(gui, "entry2"));
 	feed_name = GTK_WIDGET (gtk_builder_get_object(gui, "feed_name"));
 	if (url != NULL) {
-		flabel = g_build_path("/",
+		flabel = g_build_path(G_DIR_SEPARATOR_S,
 			lookup_main_folder(),
 			lookup_feed_folder(feed_text),
 			NULL);
@@ -1472,13 +1472,13 @@ process_dialog_edit(add_feed *feed, gchar *url, gchar *feed_name)
 			}
 
 			if (feed->renamed) {
-				gchar *a = g_build_path("/",
+				gchar *a = g_build_path(G_DIR_SEPARATOR_S,
 					lookup_main_folder(),
 					lookup_feed_folder(feed_name),
 					NULL);
 				gchar *dir = g_path_get_dirname(a);
 				gchar *b = g_build_path(
-						"/",
+						G_DIR_SEPARATOR_S,
 						dir, feed->feed_name, NULL);
 				camel_exception_init (&ex);
 				camel_store_rename_folder (store, a, b, &ex);
@@ -1798,12 +1798,12 @@ import_opml(gchar *file)
 						gchar *tmp = root;
 						if (!root)
 							root = g_build_path(
-								"/",
+								G_DIR_SEPARATOR_S,
 								base,
 								NULL);
 						else {
 							root = g_build_path(
-								"/",
+								G_DIR_SEPARATOR_S,
 								root,
 								base,
 								NULL);
@@ -1816,7 +1816,7 @@ import_opml(gchar *file)
 				//	&& strcmp(prop, "vfolder")) {
 					if (maintitle)
 						rssprefix = g_build_path(
-								"/",
+								G_DIR_SEPARATOR_S,
 								maintitle,
 								root,
 								NULL);
@@ -2314,7 +2314,7 @@ gen_folder_list(gpointer key, gpointer value, gpointer user)
 	if (tmp) {
 		tmp = g_path_get_dirname(tmp);
 		if (tmp && *tmp != '.')
-			folder = g_build_path("/", mf, tmp, NULL);
+			folder = g_build_path(G_DIR_SEPARATOR_S, mf, tmp, NULL);
 		else
 			folder = g_strdup(mf);
 		g_free(mf);
diff --git a/src/rss.c b/src/rss.c
index a1f07af..a03a2b2 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -3317,11 +3317,11 @@ add:
 
 		if (feed->edit) {
 			gchar *a = g_build_path(
-					"/",
+					G_DIR_SEPARATOR_S,
 					feed->prefix ? feed->prefix : "",
 					feed->feed_name,
 					NULL);
-			gchar *b = g_build_path("/", r->title, NULL);
+			gchar *b = g_build_path(G_DIR_SEPARATOR_S, r->title, NULL);
 			update_feed_folder(b, a, 0);
 			//r->title = feed->feed_name;
 			r->title = a;
@@ -3330,11 +3330,11 @@ add:
 
 		if (rf->import && feed->prefix) {
 			gchar *a = g_build_path(
-					"/",
+					G_DIR_SEPARATOR_S,
 					feed->prefix ? feed->prefix : "",
 					feed->feed_name,
 					NULL);
-			gchar *b = g_build_path("/", r->title, NULL);
+			gchar *b = g_build_path(G_DIR_SEPARATOR_S, r->title, NULL);
 			g_print("update_feed_folder\n");
 			update_feed_folder(b, a, 0);
 			g_print("update_feed_folder done\n");
@@ -6103,7 +6103,7 @@ verify_image(gchar *uri, EMFormatHTML *format)
 			//FIXME lame method of extracting data cache path
 			//there must be a function in camel for getting data cache path
 			base_dir = rss_component_peek_base_directory();
-			feed_dir = g_build_path("/",
+			feed_dir = g_build_path(G_DIR_SEPARATOR_S,
 				base_dir,
 				"static",
 				"http",
@@ -6272,8 +6272,8 @@ migrate_crc_md5(const char *name, gchar *url)
 	if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
 		g_mkdir_with_parents (feed_dir, 0755);
 
-	md5_name = g_build_path("/", feed_dir, md5, NULL);
-	feed_name = g_build_path("/", feed_dir, crc, NULL);
+	md5_name = g_build_path(G_DIR_SEPARATOR_S, feed_dir, md5, NULL);
+	feed_name = g_build_path(G_DIR_SEPARATOR_S, feed_dir, crc, NULL);
 	g_free(crc);
 	g_free(md5);
 
@@ -6294,7 +6294,7 @@ migrate_crc_md5(const char *name, gchar *url)
 
 	}
 	g_free(feed_name);
-	feed_name = g_build_path("/", feed_dir, crc2, NULL);
+	feed_name = g_build_path(G_DIR_SEPARATOR_S, feed_dir, crc2, NULL);
 	g_free(crc2);
 	if (g_file_test(feed_name, G_FILE_TEST_EXISTS)) {
 		FILE *fr = fopen(feed_name, "r");



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]