Commit Graph

39 Commits

Author SHA1 Message Date
8c301288f1 add a flag for non-url chars (controls, whitespace, ", and |)
* e-html-utils.c (special_chars): add a flag for non-url chars
	(controls, whitespace, ", and |)
	(url_extract): Use that. When urlifying just a hostname, make sure
	it really is a hostname, and not just something like "www.c".
	(e_text_to_html_full): Deal with url_extract returning NULL in the
	"www." case
	(main): add a regression test, #ifdef E_HTML_UTILS_TEST

svn path=/trunk/; revision=22087
2003-08-05 15:26:11 +00:00
24ee471cb1 Add this back: Connector needs it, and there's no reason for addressbook
* e-html-utils.c: Add this back: Connector needs it, and there's
	no reason for addressbook and calendar to be using camel to get
	this functionality.

	* Makefile.am (libeutil_la_SOURCES): re-add e-html-utils

svn path=/trunk/; revision=19246
2003-01-06 18:55:31 +00:00
d3d65d9bec Removed. Back to the fiery depths of hell from whence ye came!
2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>

	* e-html-utils.[c,h]: Removed. Back to the fiery depths of hell
	from whence ye came!

svn path=/trunk/; revision=19130
2002-12-16 19:47:33 +00:00
9c73777f22 First big sync of my GNOME 2 porting work (incomplete, and still
pretty broken).

Weeeeee!

svn path=/trunk/; revision=18503
2002-11-02 08:25:03 +00:00
bd8e7f9978 Convert file: urls too. Fixes bug #29557.
2002-08-28  Jeffrey Stedfast  <fejj@ximian.com>

	* e-html-utils.c (e_text_to_html_full): Convert file: urls
	too. Fixes bug #29557.

svn path=/trunk/; revision=17899
2002-08-28 19:51:44 +00:00
fb410a4f98 Remove the logic that assumes "Rupert> " is a citation, since it misfires
* e-html-utils.c (is_citation): Remove the logic that assumes
	"Rupert> " is a citation, since it misfires more often than it
	hits.

svn path=/trunk/; revision=17696
2002-08-05 13:39:16 +00:00
3a2c51d2a3 Don't use "isprint(c)" to mean "c >= 32 && c < 128" since it doesn't in
* e-html-utils.c (is_addr_char, is_trailing_garbage): Don't use
	"isprint(c)" to mean "c >= 32 && c < 128" since it doesn't in most
	locales.
	(is_domain_name_char): new macro for dns-valid characters
	(email_address_extract): Use is_domain_name_char rather than
	is_addr_char for the part after the @.

svn path=/trunk/; revision=17655
2002-07-31 19:02:02 +00:00
d7ea6022c1 Fix for if the buffer ends with an email address (and no newline).
* e-html-utils.c (e_text_to_html_full): Fix for if the buffer ends
	with an email address (and no newline).

svn path=/trunk/; revision=15802
2002-02-22 19:57:17 +00:00
08fb7329cb Fixing the license text.
svn path=/trunk/; revision=14212
2001-10-27 16:59:46 +00:00
02dcd0aadf Update the licensing information to require version 2 of the GPL
(instead of version 2 or any later version).

svn path=/trunk/; revision=14190
2001-10-27 00:25:49 +00:00
6a76e39e37 Change " " to "&nbsp;" at start of line.
* e-html-utils.c (e_text_to_html_full): Change " " to "&nbsp;" at
	start of line.

svn path=/trunk/; revision=13940
2001-10-23 13:54:38 +00:00
44faa44bff Pass a CORBA_Environment to bonobo_config_get_string so it doesn't g_warn
* e-passwords.c (e_passwords_get_password): Pass a
	CORBA_Environment to bonobo_config_get_string so it doesn't g_warn
	on error. (Since the "error" is most likely just that the password
	isn't cached.)
	(e_passwords_remember_password, e_passwords_get_password,
	e_passwords_add_password): Change "if (foo) { entire function; }"
	to "if (!foo) return;"

	* e-html-utils.c (special_chars): Don't allow single quote or
	backtick in email addresses, or pipes following URLs.

svn path=/trunk/; revision=13887
2001-10-22 18:46:46 +00:00
f6a949c349 Fix some broken calls to check_size that could result in memory corruption
* e-html-utils.c (e_text_to_html_full): Fix some broken calls to
	check_size that could result in memory corruption displaying short
	replies.

svn path=/trunk/; revision=12705
2001-09-08 16:34:21 +00:00
e14c614159 Add E_TEXT_TO_HTML_CITE, to prepend "> " to each line.
* e-html-utils.c (e_text_to_html_full): Add E_TEXT_TO_HTML_CITE,
	to prepend "> " to each line.

svn path=/trunk/; revision=12655
2001-09-06 19:47:46 +00:00
7e05144bba Added is_addr_char_no_pipes macro, which specifically does not consider
2001-07-12  Jon Trowbridge  <trow@ximian.com>

	* e-html-utils.c: Added is_addr_char_no_pipes macro, which
	specifically does not consider '|' ("pipe") to be a legal address
	character.
	(email_address_extract): Use is_addr_char_no_pipes when looking
	for e-mail addresses to turn into HTML links. (Bug #3940)

svn path=/trunk/; revision=11029
2001-07-12 05:42:49 +00:00
91cc026904 Update the copyrights, replacing Helix Code with Ximian and
helixcode.com with ximian.com all over the place.

svn path=/trunk/; revision=10440
2001-06-23 08:52:02 +00:00
23bcf6e31a add E_TEXT_TO_HTML_ESCAPE_8BIT to turn non-US-ASCII characters into "?"s.
* e-html-utils.c (e_text_to_html_full): add
	E_TEXT_TO_HTML_ESCAPE_8BIT to turn non-US-ASCII characters into
	"?"s.

svn path=/trunk/; revision=9859
2001-05-16 22:30:44 +00:00
05817ac122 Replicate the semantics of the libunicode utf8 functions by returning NULL
2001-05-14  Jon Trowbridge  <trow@ximian.com>

        * camel-search-private.c (utf8_get): Replicate the semantics of
        the libunicode utf8 functions by returning NULL in the arg
        on invalid utf8.

        * camel-pgp-context.c (pgp_verify): Check for valid utf8,
        terminate loop if something looks wrong.

        * camel-mime-utils.c (header_encode_phrase_get_words): Properly
        check for invalid utf8.
        (header_encode_string): Properly check for invalid utf8.

        * camel-charset-map.c (camel_charset_step): Properly check for
        invalid utf8.

2001-05-14  Jon Trowbridge  <trow@ximian.com>

        * e-html-utils.c (is_citation): Check for bad utf8.

svn path=/trunk/; revision=9798
2001-05-14 21:04:35 +00:00
eba2691d5d Don't use g_utf8_next_char on text that isn't valid UTF8, since it won't
* e-html-utils.c (e_text_to_html_full): Don't use g_utf8_next_char
	on text that isn't valid UTF8, since it won't work (and might even
	get into an infinite loop).

svn path=/trunk/; revision=9637
2001-05-01 16:46:31 +00:00
9071df0d8f Make this smarter. Now e_text_to_html_full calls it when it sees a '@',
* e-html-utils.c (email_address_extract): Make this smarter. Now
	e_text_to_html_full calls it when it sees a '@', and
	email_address_extract deals with scanning both forward and
	backward to find the bounds of the email address. It's still
	fooled by Message-IDs, but there's not a whole lot we can do
	there...

svn path=/trunk/; revision=9628
2001-04-29 17:41:33 +00:00
ec67eb41a7 If the buffer is too small, making it twice as big does not guarantee it
* e-html-utils.c (check_size): If the buffer is too small, making
	it twice as big does not guarantee it will be big enough. "Duh".
	Also, a bunch of the check_size calls don't seem to be taking
	trailing NULs into account, so add in a +1 here.

svn path=/trunk/; revision=9549
2001-04-24 20:00:38 +00:00
038d1a932c Removed attempts to use Radek's evil <DATA> hacks, which were just causing
2001-04-23  Jon Trowbridge  <trow@ximian.com>

        * e-html-utils.c (e_text_to_html_full): Removed attempts to use
        Radek's evil <DATA> hacks, which were just causing me
        (and GtkHTML) grief.

2001-04-23  Jon Trowbridge  <trow@ximian.com>

        * gui/component/e-address-popup.c: Lots of code has been
        simplified here.
        (e_address_popup_factory_new_control): Rather than directly pop
        our control up in a window (via the e_address_popup_popup
        function, which is now gone), just return the widget and let the
        caller do the popping.  This works better, since it means we don't
        have to work around the vagaries of bonobo focus & event handling.
        (e_address_popup_set_name): Refresh when both name & email have
        been set, rather than checking a stupid counter.
        (e_address_popup_set_email): Ditto.

2001-04-23  Jon Trowbridge  <trow@ximian.com>

        * mail-display.c (html_button_press_event): Check for mailto:
        links, and pop up our mail address menu when we find one.
        (make_popup_window): The main piece of code (ignoring a zillion
        little callbacks) to pop up our windows with reasonable semantics
        for having them close automatically.
        (mail_text_write): Enable converting addresses to mailto links
        in message bodies.

        * mail-format.c (write_address): Simplify code, removing Radek's
        <DATA> hacks.  Write out addresses as mailto: links.

svn path=/trunk/; revision=9534
2001-04-24 02:51:45 +00:00
a50c888bbe ">From" is not a citation unless the previous or following line is a
* e-html-utils.c (is_citation): ">From" is not a citation unless
        the previous or following line is a citation.
        (e_text_to_html_full): Update for is_citation change. Also, when
        marking citations, unmangle mbox From-mangling.

svn path=/trunk/; revision=9458
2001-04-19 14:37:05 +00:00
2067796514 Add support for converting e-mail addresses to links. (is_email_address):
2001-03-30  Jon Trowbridge  <trow@ximian.com>

        * e-html-utils.c (e_text_to_html_full): Add support for converting
        e-mail addresses to links.
        (is_email_address): Added.  Identifies e-mail addresses.
        (email_address_extract): Added.  Extracts a copy of the e-mail
        address from the text.

        * e-html-utils.h (E_TEXT_TO_HTML_CONVERT_ADDRESSES): Added.

        * e-url.c (e_url_shroud): Added.  Copy a url, replacing
        any plaintext passwords with a single *.
        (e_url_equal): Compare two urls, taking into account that
        they may or may not be shrouded.

2001-03-30  Jon Trowbridge  <trow@ximian.com>

        * camel-mime-message.c (camel_mime_message_set_source): Shrould
        our source URL before putting it into X-Evolution-Source.

2001-03-30  Jon Trowbridge  <trow@ximian.com>

        * mail-display.c (mail_text_write): Add (commented-out)
        E_TEXT_TO_HTML_CONVERT_ADDRESSES.

        * mail-config.c (mail_config_get_account_by_source_url):
        Call e_url_equal to compare URLs.

svn path=/trunk/; revision=9050
2001-03-30 18:05:48 +00:00
6d9167de80 Remove #include <glib.h> Shuffle some headers. Remove #include
2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>

	* e-corba-utils.h: Remove #include <glib.h>
	* e-dialog-widgets.c: Shuffle some headers.
	* e-dialog-widgets.h: Remove #include <libgnomeui/gnome-propertybox.h>
	* e-gtk-utils.c: #include <gtk/gtksignal.h>
	* e-gtk-utils.h: Replace #include <gtk/gtk.h>
	* e-gui-utils.c: Replace #include <gnome.h>
	* e-html-utils.c: Shuffle headers.
	* e-iterator.c: Replace #include <gtk/gtk.h>
	* e-iterator.h: Replace #include <gtk/gtk.h>
	* e-list-iterator.c: Remove #include <gtk/gtk.h>
	* e-list-iterator.h: Replace #include <gtk/gtk.h>
	* e-list.c: Remove #include <gtk/gtk.h>
	* e-list.h: Replace #include <gtk/gtk.h>
	* e-memory.c: #include <string.h> and <stdlib.h>
	* e-msgport.c: Move around some includes. s/%d/%ld/g in a printf()
	call to fix a warning.
	* e-pilot-map.c: #include <string.h>. Replace #include <gnome.h>
	* e-pilot-util.c: Remove #include <gnome.h>
	* e-sexp.c: Remove #include <glib.h>
	* e-sexp.h: Replace #include <gtk/gtk.h>
	* e-time-utils.c: #include <string.h>
	* md5-utils.c: Shuffle headers.
	* test-ename-western-gtk.c: Replace #include <gnome.h>
	* test-ename-western.c: Same here.

svn path=/trunk/; revision=9016
2001-03-29 18:07:13 +00:00
3e105b5bb7 new function, extracted from e_text_to_html, added color parameter
2001-03-20  Radek Doulik  <rodo@ximian.com>

	* e-html-utils.c (e_text_to_html_full): new function, extracted
	from e_text_to_html, added color parameter

2001-03-19  Radek Doulik  <rodo@ximian.com>

	* e-html-utils.c (e_text_to_html): support mark citation

	* e-html-utils.h (E_TEXT_TO_HTML_MARK_CITATION): added
	E_TEXT_TO_HTML_MARK_CITATION

svn path=/trunk/; revision=8847
2001-03-20 16:50:12 +00:00
aa69aa95cd Fix a bit: [mailto:foo] shouldn't grab the ']'
* e-html-utils.c (url_extract): Fix a bit: [mailto:foo] shouldn't
	grab the ']'

svn path=/trunk/; revision=8736
2001-03-15 14:36:23 +00:00
bb6e7097e0 Fix an off-by-one in the "is this for real?" check so that "http:// "
* e-html-utils.c (url_extract): Fix an off-by-one in the "is this
	for real?" check so that "http:// " won't get URLified

svn path=/trunk/; revision=8581
2001-03-07 15:39:54 +00:00
9fc3ed958a make sure we actually make enough space for "&nbsp;".
2000-12-13  Larry Ewing  <lewing@helixcode.com>

	* e-html-utils.c (e_text_to_html): make sure we actually make
	enough space for "&nbsp;".

svn path=/trunk/; revision=6964
2000-12-13 08:52:53 +00:00
0b2c3f424b Deal properly with URLs at the end of the buffer. (The old code would
* e-html-utils.c (e_text_to_html): Deal properly with URLs at the
	end of the buffer. (The old code would append a "&#0;" to the
	text.)

svn path=/trunk/; revision=6169
2000-10-25 16:07:20 +00:00
c03848ecdf If unicode_get_utf8 returns -1, assume it was actually undeclared
* e-html-utils.c (e_text_to_html): If unicode_get_utf8 returns -1,
	assume it was actually undeclared iso-8859-1 text.

svn path=/trunk/; revision=6002
2000-10-18 18:59:21 +00:00
e60c558b25 Email should now display correctly in GtkHTML
svn path=/trunk/; revision=5154
2000-09-01 02:40:45 +00:00
c415597aa4 Little teeny bug fix in e_text_to_html tab expansion.
svn path=/trunk/; revision=4905
2000-08-21 18:42:10 +00:00
00d16af773 Fix a crash with tab expansion in e_text_to_html
svn path=/trunk/; revision=4736
2000-08-11 15:51:01 +00:00
7df68b2c7d If converting both spaces and newlines, then convert tabs too. The joys of
* e-html-utils.c (e_text_to_html): If converting both spaces and
	newlines, then convert tabs too. The joys of pseudo-<PRE>.

svn path=/trunk/; revision=4695
2000-08-10 18:45:44 +00:00
dd38706a92 Fix warnings.
* e-html-utils.c: Fix warnings.

svn path=/trunk/; revision=4048
2000-07-10 20:35:43 +00:00
94f71e47c2 add ")" to the set of characters to back up over at the end of a potential
* e-html-utils.c (url_extract): add ")" to the set of characters
	to back up over at the end of a potential URL.

svn path=/trunk/; revision=3778
2000-06-28 20:37:21 +00:00
7453ffb6a8 Got rid of some warnings.
2000-05-06  Christopher James Lahey  <clahey@helixcode.com>

	* e-html-utils.c: Got rid of some warnings.

	* e-util.c, e-util.h: Added e_read_file which takes a filename and
	returns a newly allocated string containing the contents of that
	file.

svn path=/trunk/; revision=2828
2000-05-06 17:04:10 +00:00
aef27503fb Moved here from the mailer, since it's of general use, and the composer
* e-html-utils.c (e_text_to_html): Moved here from the mailer,
	since it's of general use, and the composer needs it too.

svn path=/trunk/; revision=2662
2000-04-27 19:01:18 +00:00