diff gtk/plugins/perl/common/GtkIMHtml.xs @ 14567:d6eae5115b31

[gaim-migrate @ 17291] This is a really huge commit for basically nothing, I decided that Gaim::Gtk should really be Gaim::GtkUI (which will line up better with any eventual Gaim::GntUI that might exist, etc.). So that's what this is, I think I got everything, it builds here at least. committer: Tailor Script <[e-mail]>

--- a/gtk/plugins/perl/common/GtkIMHtml.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkIMHtml.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -13,9 +13,9 @@
  * about doing that.
 void
 gtk_imhtml_insert_html_at_iter(imhtml, text, options, iter)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * text
-	Gaim::Gtk::IMHtml::Options options
+	Gaim::GtkUI::IMHtml::Options options
 	Gtk::TextIter iter
 */
 
@@ -24,7 +24,7 @@
  * about doing that.
 void
 gtk_imhtml_delete(imhtml, start, end)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextIter start
 	Gtk::TextIter end
 */
@@ -34,7 +34,7 @@
  * about doing that.
 void
 gtk_imhtml_insert_link(imhtml, mark, url, text)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextMark mark
 	const char * url
 	const char * text
@@ -45,14 +45,14 @@
  * about doing that.
 void
 gtk_imhtml_insert_smiley_at_iter(imhtml, sml, smiley, iter)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * sml
 	char * smiley
 	Gtk::TextIter iter
 
 void
 gtk_imhtml_insert_image_at_iter(imhtml, id, iter)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	int id
 	Gtk::TextIter iter
 */
@@ -62,7 +62,7 @@
  * about doing that.
 char *
 gtk_imhtml_get_markup_range(imhtml, start, end)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextIter start
 	Gtk::TextIter end
 */
@@ -72,7 +72,7 @@
  * about doing that.
 char *
 gtk_imhtml_get_text(imhtml, start, end)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextIter start
 	Gtk::TextIter end
 */
@@ -80,7 +80,7 @@
 /* This can't work at the moment since I don't have a typemap for Gdk::Pixbuf.
  * I thought about using the one from libgtk2-perl but wasn't sure how to go
  * about doing that.
-Gaim::Gtk::IMHtml::Scalable
+Gaim::GtkUI::IMHtml::Scalable
 gtk_imhtml_image_new(img, filename, id)
 	Gdk::Pixbuf img
 	const gchar * filename
@@ -92,8 +92,8 @@
  * about doing that.
 void
 gtk_imhtml_image_add_to(scale, imhtml, iter)
-	Gaim::Gtk::IMHtml::Scalable scale
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextIter iter
 */
 
@@ -102,69 +102,69 @@
  * about doing that.
 void
 gtk_imhtml_hr_add_to(scale, imhtml, iter)
-	Gaim::Gtk::IMHtml::Scalable scale
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextIter iter
 */
 
 /* This can't work at the moment since I don't have a typemap for gboolean *.
 void
 gtk_imhtml_get_current_format(imhtml, bold, italic, underline)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gboolean * bold
 	gboolean * italic
 	gboolean * underline
 */
 
-MODULE = Gaim::Gtk::IMHtml  PACKAGE = Gaim::Gtk::IMHtml  PREFIX = gtk_imhtml_
+MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml  PREFIX = gtk_imhtml_
 PROTOTYPES: ENABLE
 
-Gaim::Gtk::IMHtml::Smiley
+Gaim::GtkUI::IMHtml::Smiley
 gtk_imhtml_smiley_get(imhtml, sml, text)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * sml
 	const gchar * text
 
 void
 gtk_imhtml_associate_smiley(imhtml, sml, smiley)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * sml
-	Gaim::Gtk::IMHtml::Smiley smiley
+	Gaim::GtkUI::IMHtml::Smiley smiley
 
 void
 gtk_imhtml_remove_smileys(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_set_funcs(imhtml, f)
-	Gaim::Gtk::IMHtml imhtml
-	Gaim::Gtk::IMHtml::Funcs f
+	Gaim::GtkUI::IMHtml imhtml
+	Gaim::GtkUI::IMHtml::Funcs f
 
 void
 gtk_imhtml_show_comments(imhtml, show)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gboolean show
 
 const char *
 gtk_imhtml_get_protocol_name(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_set_protocol_name(imhtml, protocol_name)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * protocol_name
 
 void
 gtk_imhtml_append_text(imhtml, text, options)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * text
-	Gaim::Gtk::IMHtml::Options options
+	Gaim::GtkUI::IMHtml::Options options
 
 void
 gtk_imhtml_append_text_with_images(imhtml, text, options, unused = NULL)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * text
-	Gaim::Gtk::IMHtml::Options options
+	Gaim::GtkUI::IMHtml::Options options
 	SV *unused
 PREINIT:
 	GSList *t_GL;
@@ -181,173 +181,185 @@
 
 void
 gtk_imhtml_scroll_to_end(imhtml, smooth)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gboolean smooth
 
 void
 gtk_imhtml_clear(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_page_up(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_page_down(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_set_editable(imhtml, editable)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gboolean editable
 
 void
 gtk_imhtml_set_whole_buffer_formatting_only(imhtml, wbo)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gboolean wbo
 
 void
 gtk_imhtml_set_format_functions(imhtml, buttons)
-	Gaim::Gtk::IMHtml imhtml
-	Gaim::Gtk::IMHtml::Buttons buttons
+	Gaim::GtkUI::IMHtml imhtml
+	Gaim::GtkUI::IMHtml::Buttons buttons
 
-Gaim::Gtk::IMHtml::Buttons
+Gaim::GtkUI::IMHtml::Buttons
 gtk_imhtml_get_format_functions(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 char *
 gtk_imhtml_get_current_fontface(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 char *
 gtk_imhtml_get_current_forecolor(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 char *
 gtk_imhtml_get_current_backcolor(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 char *
 gtk_imhtml_get_current_background(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 gint
 gtk_imhtml_get_current_fontsize(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 gboolean
 gtk_imhtml_get_editable(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_clear_formatting(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_bold(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_italic(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_underline(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_strike(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_forecolor(imhtml, color)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * color
 
 void
 gtk_imhtml_toggle_backcolor(imhtml, color)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * color
 
 void
 gtk_imhtml_toggle_background(imhtml, color)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * color
 
 void
 gtk_imhtml_toggle_fontface(imhtml, face)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * face
 
 void
 gtk_imhtml_toggle_link(imhtml, url)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * url
 
 void
 gtk_imhtml_insert_smiley(imhtml, sml, smiley)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * sml
 	char * smiley
 
 void
 gtk_imhtml_font_set_size(imhtml, size)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gint size
 
 void
 gtk_imhtml_font_shrink(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_font_grow(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 char *
 gtk_imhtml_get_markup(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
-char **
+# ETAN Test this, and document well that it returns an arrayref
+void
 gtk_imhtml_get_markup_lines(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
+PREINIT:
+	gint i;
+	AV *lines;
+	gchar **bufs;
+PPCODE:
+	bufs = gtk_imhtml_get_markup_lines(imhtml);
+	lines = newAV();
+	for (i = 0; bufs[i]; i++) {
+	    av_push(lines, newSVpv(bufs[i], 0));
+	}
+	XPUSHs(sv_2mortal(newRV_noinc((SV *)lines)));
 
-MODULE = Gaim::Gtk::IMHtml  PACKAGE = Gaim::Gtk::IMHtml::Scalable  PREFIX = gtk_imhtml_image_
+MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml::Scalable  PREFIX = gtk_imhtml_image_
 PROTOTYPES: ENABLE
 
 void
 gtk_imhtml_image_free(scale)
-	Gaim::Gtk::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml::Scalable scale
 
 void
 gtk_imhtml_image_scale(scale, width, height)
-	Gaim::Gtk::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml::Scalable scale
 	int width
 	int height
 
-MODULE = Gaim::Gtk::IMHtml  PACKAGE = Gaim::Gtk::IMHtml::Hr  PREFIX = gtk_imhtml_hr_
+MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml::Hr  PREFIX = gtk_imhtml_hr_
 PROTOTYPES: ENABLE
 
-Gaim::Gtk::IMHtml::Scalable
+Gaim::GtkUI::IMHtml::Scalable
 gtk_imhtml_hr_new()
 
 void
 gtk_imhtml_hr_free(scale)
-	Gaim::Gtk::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml::Scalable scale
 
 void
 gtk_imhtml_hr_scale(scale, width, height)
-	Gaim::Gtk::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml::Scalable scale
 	int width
 	int height
 
-MODULE = Gaim::Gtk::IMHtml  PACKAGE = Gaim::Gtk::IMHtml::Search  PREFIX = gtk_imhtml_search_
+MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml::Search  PREFIX = gtk_imhtml_search_
 PROTOTYPES: ENABLE
 
 gboolean
 gtk_imhtml_search_find(imhtml, text)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * text
 
 void
 gtk_imhtml_search_clear(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml