# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1314862329 0
# Node ID 3340d322c8f80423a52bbf2ebf861466905ef26d
# Parent  2f014dbda8a6c60a8070b473e70f31eb36ecad65
Make another gtkimhtml function private.
I'm definitely hoping we can get rid of all this code and switch to webkit
for 3.0.0.  I haven't tried the branch.

diff -r 2f014dbda8a6 -r 3340d322c8f8 ChangeLog.API
--- a/ChangeLog.API	Thu Sep 01 07:27:16 2011 +0000
+++ b/ChangeLog.API	Thu Sep 01 07:32:09 2011 +0000
@@ -87,6 +87,7 @@
 		* gtk_imhtml_animation_new
 		* gtk_imhtml_image_add_to
 		* gtk_imhtml_image_free
+		* gtk_imhtml_image_new
 		* gtk_imhtml_image_scale
 		* pidgin_blist_update_account_error_state
 		* pidgin_check_if_dir
diff -r 2f014dbda8a6 -r 3340d322c8f8 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Thu Sep 01 07:27:16 2011 +0000
+++ b/pidgin/gtkimhtml.c	Thu Sep 01 07:32:09 2011 +0000
@@ -3903,8 +3903,16 @@
 	g_object_set_data_full(G_OBJECT(box), "image-save-data", save, (GDestroyNotify)g_free);
 }
 
-/* GtkIMHtmlScalable, gtk_imhtml_image, gtk_imhtml_hr */
-GtkIMHtmlScalable *gtk_imhtml_image_new(GdkPixbuf *img, const gchar *filename, int id)
+/**
+ * Creates and returns a new GTK+ IM/HTML scalable object with an image.
+ *
+ * @param img      A GdkPixbuf of the image to add.
+ * @param filename The filename to associate with the image.
+ * @param id       The id to associate with the image.
+ *
+ * @return A new IM/HTML Scalable object with an image.
+ */
+static GtkIMHtmlScalable *gtk_imhtml_image_new(GdkPixbuf *img, const gchar *filename, int id)
 {
 	GtkIMHtmlImage *im_image = g_malloc(sizeof(GtkIMHtmlImage));
 
diff -r 2f014dbda8a6 -r 3340d322c8f8 pidgin/gtkimhtml.h
--- a/pidgin/gtkimhtml.h	Thu Sep 01 07:27:16 2011 +0000
+++ b/pidgin/gtkimhtml.h	Thu Sep 01 07:32:09 2011 +0000
@@ -416,17 +416,6 @@
 GtkIMHtmlScalable *gtk_imhtml_scalable_new(void);
 
 /**
- * Creates and returns a new GTK+ IM/HTML scalable object with an image.
- *
- * @param img      A GdkPixbuf of the image to add.
- * @param filename The filename to associate with the image.
- * @param id       The id to associate with the image.
- *
- * @return A new IM/HTML Scalable object with an image.
- */
-GtkIMHtmlScalable *gtk_imhtml_image_new(GdkPixbuf *img, const gchar *filename, int id);
-
-/**
  * Creates and returns an new GTK+ IM/HTML scalable with a horizontal rule.
  *
  * @return A new IM/HTML Scalable object with an image.
diff -r 2f014dbda8a6 -r 3340d322c8f8 pidgin/plugins/perl/common/GtkIMHtml.xs
--- a/pidgin/plugins/perl/common/GtkIMHtml.xs	Thu Sep 01 07:27:16 2011 +0000
+++ b/pidgin/plugins/perl/common/GtkIMHtml.xs	Thu Sep 01 07:32:09 2011 +0000
@@ -77,26 +77,6 @@
 	Gtk::TextIter end
 */
 
-/* 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.
-Pidgin::IMHtml::Scalable
-gtk_imhtml_image_new(img, filename, id)
-	Gdk::Pixbuf img
-	const gchar * filename
-	int id
-*/
-
-/* This can't work at the moment since I don't have a typemap for Gtk::Widget.
- * I thought about using the one from libgtk2-perl but wasn't sure how to go
- * about doing that.
-void
-gtk_imhtml_image_add_to(scale, imhtml, iter)
-	Pidgin::IMHtml::Scalable scale
-	Pidgin::IMHtml imhtml
-	Gtk::TextIter iter
-*/
-
 /* This can't work at the moment since I don't have a typemap for Gtk::Widget.
  * I thought about using the one from libgtk2-perl but wasn't sure how to go
  * about doing that.