# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1058132424 0
# Node ID 11bedb793a440064b7a5abc812637a14aad50228
# Parent  3c70f8be8558ae279d37807124958584be6cef12
[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>

diff -r 3c70f8be8558 -r 11bedb793a44 src/gaim.h
--- 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);
 
diff -r 3c70f8be8558 -r 11bedb793a44 src/gtkconv.c
--- 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"
diff -r 3c70f8be8558 -r 11bedb793a44 src/html.c
--- 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"
diff -r 3c70f8be8558 -r 11bedb793a44 src/html.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_ */
diff -r 3c70f8be8558 -r 11bedb793a44 src/protocols/jabber/jabber.c
--- 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"
diff -r 3c70f8be8558 -r 11bedb793a44 src/protocols/oscar/oscar.c
--- 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"
diff -r 3c70f8be8558 -r 11bedb793a44 src/protocols/toc/toc.c
--- a/src/protocols/toc/toc.c	Sun Jul 13 20:59:27 2003 +0000
+++ b/src/protocols/toc/toc.c	Sun Jul 13 21:40:24 2003 +0000
@@ -30,6 +30,7 @@
 #include "proxy.h"
 #include "request.h"
 #include "util.h"
+#include "html.h"
 
 /* XXX */
 #include "gaim.h"
diff -r 3c70f8be8558 -r 11bedb793a44 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Sun Jul 13 20:59:27 2003 +0000
+++ b/src/protocols/yahoo/yahoo.c	Sun Jul 13 21:40:24 2003 +0000
@@ -31,6 +31,7 @@
 #include "request.h"
 #include "server.h"
 #include "util.h"
+#include "html.h"
 
 #include "md5.h"