evolution-rss r132 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri Jan 25 19:45:54 2008
New Revision: 132
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=132&view=rev

Log:
fix generate_safe_name

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/network-soup.c
   trunk/src/rss.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Fri Jan 25 19:45:54 2008
@@ -34,8 +34,8 @@
 	* fix move->rename
 	* use svn tag stuff when releasing
 	* fix when editing existing feeds
-	* fix ubuntu crashing when wrong entities
+	* fix ubuntu crashing when wrong entities (<0.0.6)
 	* do not remove hash key when iterate !
-	* check importing as it won't run for the first time
+	* check importing, as it won't run for the first time
 	* check gtk 2.6 detection
 	* make auth dialog not intrusive (peek other software)

Modified: trunk/src/network-soup.c
==============================================================================
--- trunk/src/network-soup.c	(original)
+++ trunk/src/network-soup.c	Fri Jan 25 19:45:54 2008
@@ -309,6 +309,7 @@
         char **password,
         gpointer data)
 {
+	g_print("authtype:%s\n", auth_type);
 	if (rf->soup_auth_retry)
 	{
 		//means we're already tested once and probably

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri Jan 25 19:45:54 2008
@@ -3333,11 +3333,34 @@
 gchar *
 generate_safe_chn_name(gchar *chn_name)
 {
-	guint i = 1;
+	guint i = 0;
+	gchar *c;
+	gchar *stmp;
 	while (check_chn_name(chn_name))
 	{
+		GString *result = g_string_new (NULL);
 		gchar *tmp = chn_name;
-		chn_name = g_strdup_printf("%s #%d", tmp, i++);
+		if (c = strrchr(tmp, '#'))
+		{
+			if (isdigit(*(c+1)))
+			{
+				stmp = g_strndup(tmp, c - tmp);
+				while (isdigit(*(c+1)))
+				{
+					g_string_append_c(result, *(c+1));
+					c++;
+				}
+				i = atoi(result->str);
+				chn_name = g_strdup_printf("%s#%d", stmp, i+1);
+				g_free(stmp);
+			}
+			else
+				chn_name = g_strdup_printf("%s #%d", tmp, i+1);
+		}
+		else
+			chn_name = g_strdup_printf("%s #%d", tmp, i+1);
+		memset(result->str, 0, result->len);
+		g_string_free (result, TRUE);
 		g_free(tmp);
 	}
 	return chn_name;
@@ -4410,8 +4433,10 @@
 			if (!render) 	// set render just in case it was forced in configure
 			{
 				render = RENDER_N;
-  				gconf_client_set_int(rss_gconf, GCONF_KEY_HTML_RENDER, render, NULL);
+  				gconf_client_set_int(rss_gconf, 
+						GCONF_KEY_HTML_RENDER, render, NULL);
 			}
+			g_print("sfn:%s\n", generate_safe_chn_name("ora 7 buca dimineata #1234"));
 #ifdef HAVE_GTKMOZEMBED
 			if (2 == render)
 				rss_mozilla_init();