aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog6
-rw-r--r--e-util/e-url.c8
2 files changed, 8 insertions, 6 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 4fa4bd408a..b0124f356b 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-31 Jon Trowbridge <trow@ximian.com>
+
+ * e-url.c (e_url_shroud): Check that first_colon < last_at,
+ to prevent horrible things from happening. Removed spew.
+ (e_url_equal): Removed spew.
+
2001-03-30 Jon Trowbridge <trow@ximian.com>
* e-html-utils.c (e_text_to_html_full): Add support for converting
diff --git a/e-util/e-url.c b/e-util/e-url.c
index ffebba7827..8b54a81d16 100644
--- a/e-util/e-url.c
+++ b/e-util/e-url.c
@@ -53,14 +53,12 @@ e_url_shroud (const char *url)
++p;
}
- if (first_colon && last_at) {
- shrouded = g_strdup_printf ("%.*s*%s", first_colon - url + 1, url, last_at);
+ if (first_colon && last_at && first_colon < last_at) {
+ shrouded = g_strdup_printf ("%.*s%s", first_colon - url, url, last_at);
} else {
shrouded = g_strdup (url);
}
- g_message ("shrouded [%s] to [%s]", url, shrouded);
-
return shrouded;
}
@@ -84,7 +82,5 @@ e_url_equal (const char *url1, const char *url2)
g_free (shroud1);
g_free (shroud2);
- g_message ("[%s] and [%s] are%s equal", url1, url2, rv ? "" : " NOT");
-
return rv;
}