Mercurial > pidgin.yaz
changeset 6115:11bedb793a44
[gaim-migrate @ 6578]
I can't believe I never committed this.
I moved the "html" function definitions out of gaim.h and put them in
html.h. I think I got every file that uses them, but if someone finds a
file I missed, add the #include there.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Sun, 13 Jul 2003 21:40:24 +0000 |
| parents | 3c70f8be8558 |
| children | de49cfd8fd59 |
| files | src/gaim.h src/gtkconv.c src/html.c src/html.h src/protocols/jabber/jabber.c src/protocols/oscar/oscar.c src/protocols/toc/toc.c src/protocols/yahoo/yahoo.c |
| diffstat | 8 files changed, 46 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gaim.h Sun Jul 13 20:59:27 2003 +0000 +++ b/src/gaim.h Sun Jul 13 21:40:24 2003 +0000 @@ -53,18 +53,6 @@ /* Functions in gaimrc.c */ extern gint sort_awaymsg_list(gconstpointer, gconstpointer); -/* Functions in html.c */ -struct g_url { - char address[255]; - int port; - char page[255]; -}; - -extern void grab_url(char *, gboolean, void (*callback)(gpointer, char *, unsigned long), gpointer); -extern gchar *strip_html(const gchar *); -extern void html_to_xhtml(const char *, char **, char **); -struct g_url *parse_url(char *url); - /* Functions in idle.c */ extern gint check_idle(gpointer);
--- a/src/gtkconv.c Sun Jul 13 20:59:27 2003 +0000 +++ b/src/gtkconv.c Sun Jul 13 21:40:24 2003 +0000 @@ -32,6 +32,7 @@ #include <gdk/gdkkeysyms.h> #include "debug.h" +#include "html.h" #include "log.h" #include "multi.h" #include "notify.h"
--- a/src/html.c Sun Jul 13 20:59:27 2003 +0000 +++ b/src/html.c Sun Jul 13 21:40:24 2003 +0000 @@ -22,6 +22,7 @@ #include "internal.h" #include "debug.h" +#include "html.h" #include "proxy.h" #include "gaim.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/html.h Sun Jul 13 21:40:24 2003 +0000 @@ -0,0 +1,40 @@ +/** + * @file html.h HTML Utility API + * @ingroup core + * + * gaim + * + * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef _GAIM_HTML_H_ +#define _GAIM_HTML_H_ + +struct g_url { + char address[255]; + int port; + char page[255]; +}; + +void grab_url(char *url, gboolean full, + void (*callback)(gpointer, char *, unsigned long), + gpointer data); + +gchar *strip_html(const gchar *text); +void html_to_xhtml(const char *html, char **xhtml_out, char **plain_out); +struct g_url *parse_url(char *url); + +#endif /* _GAIM_HTML_H_ */
--- a/src/protocols/jabber/jabber.c Sun Jul 13 20:59:27 2003 +0000 +++ b/src/protocols/jabber/jabber.c Sun Jul 13 21:40:24 2003 +0000 @@ -35,6 +35,7 @@ #include "prpl.h" #include "request.h" #include "util.h" +#include "html.h" /* XXX */ #include "gaim.h"
--- a/src/protocols/oscar/oscar.c Sun Jul 13 20:59:27 2003 +0000 +++ b/src/protocols/oscar/oscar.c Sun Jul 13 21:40:24 2003 +0000 @@ -34,6 +34,7 @@ #include "proxy.h" #include "request.h" #include "util.h" +#include "html.h" #include "aim.h" #include "md5.h"