evolution-rss r379 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri Sep 26 16:26:59 2008
New Revision: 379
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=379&view=rev

Log:
2008-09-26  Lucian Langa  <lucilanga gnome org>

* src/misc.c: sanitize_url() correctly 
free created string
* src/rss-config-factory.c: allow
typeahead through feed list

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/misc.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Fri Sep 26 16:26:59 2008
@@ -35,4 +35,3 @@
 	* provide predefined groups of feeds (OSS & co)
 	* evolution import rss add no. of retries
 	* fix images when replying
-	* free willy all instances of strextr

Modified: trunk/src/misc.c
==============================================================================
--- trunk/src/misc.c	(original)
+++ trunk/src/misc.c	Fri Sep 26 16:26:59 2008
@@ -68,17 +68,21 @@
 gchar *
 sanitize_url(gchar *text)
 {
+	gchar *out;
 	if (strstr(text, "feed://"))
-		text = strextr(text, "feed://");
+		tmptext = strextr(text, "feed://");
 	if (strstr(text, "feed//"))
-		text = strextr(text, "feed//");
+		tmptext = strextr(text, "feed//");
 	if (strstr(text, "feed:"))
-		text = strextr(text, "feed:");
- 	if (!strstr (text, "http://";) 
-	&& !strstr (text, "https://";))
- 		return g_strconcat("http://";, text, NULL);
+		tmptext = strextr(text, "feed:");
+ 	if (!strstr (tmptext, "http://";) 
+	&& !strstr (tmptext, "https://";))
+		out = g_strconcat("http://";, tmptext, NULL);
  	else
- 		return g_strdup(text);
+		out = g_strdup(tmptext);
+
+	g_free(tmptext);
+ 	return out;
 }
 
 //evolution folder must not contain certain chars