evolution-rss r381 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Tue Sep 30 12:47:26 2008
New Revision: 381
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=381&view=rev

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

* src/misc.c: sanitize_url() correctly 
free old string

Modified:
   trunk/ChangeLog
   trunk/src/misc.c
   trunk/src/rss-config-factory.c

Modified: trunk/src/misc.c
==============================================================================
--- trunk/src/misc.c	(original)
+++ trunk/src/misc.c	Tue Sep 30 12:47:26 2008
@@ -68,13 +68,15 @@
 gchar *
 sanitize_url(gchar *text)
 {
-	gchar *out, *tmptext;
+	gchar *out;
+	gchar *tmptext = g_strdup(text);
 	if (strstr(text, "feed://"))
 		tmptext = strextr(text, "feed://");
 	if (strstr(text, "feed//"))
 		tmptext = strextr(text, "feed//");
 	if (strstr(text, "feed:"))
 		tmptext = strextr(text, "feed:");
+
  	if (!strstr (tmptext, "http://";) 
 	&& !strstr (tmptext, "https://";))
 		out = g_strconcat("http://";, tmptext, NULL);

Modified: trunk/src/rss-config-factory.c
==============================================================================
--- trunk/src/rss-config-factory.c	(original)
+++ trunk/src/rss-config-factory.c	Tue Sep 30 12:47:26 2008
@@ -428,7 +428,6 @@
                               GTK_ACCEL_VISIBLE);
 	gtk_window_add_accel_group (GTK_WINDOW (dialog1), accel_group);
 
-
   	gint result = gtk_dialog_run(GTK_DIALOG(dialog1));
   	switch (result)
   	{
@@ -1737,7 +1736,7 @@
         gtk_widget_show (lbl_size_val);
         gtk_misc_set_alignment (GTK_MISC (lbl_size), 0.0, 0.5);
         gtk_misc_set_alignment (GTK_MISC (lbl_size_val), 0.0, 0.5);
-       gtk_box_pack_start (GTK_BOX (dialog1), lbl_size, FALSE, TRUE, 12);
+        gtk_box_pack_start (GTK_BOX (dialog1), lbl_size, FALSE, TRUE, 12);
         gtk_box_pack_start (GTK_BOX (dialog1), lbl_size_val, FALSE, TRUE, 10);
         gtk_widget_show_all (GTK_WIDGET (dialog1));