pidgin: f21ba844: Make another gtkimhtml function private.

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: f21ba844464858c0ea853c940fd4433ce008cb07
Parent:   767d9d6643d4894d810716fe49cf0b83c3ca12b8
Author:   markdoliner at pidgin.im
Date:     09/01/11 03:32:09
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f21ba844464858c0ea853c940fd4433ce008cb07

Changelog: 

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.

Changes against parent 767d9d6643d4894d810716fe49cf0b83c3ca12b8

  patched  ChangeLog.API
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtml.h
  patched  pidgin/plugins/perl/common/GtkIMHtml.xs

-------------- next part --------------
============================================================
--- pidgin/gtkimhtml.c	2017d0a430a2a8f4351dabfc3ce329bb79657a6d
+++ pidgin/gtkimhtml.c	7f48dca667aa765d4c428ebf8554db811452a8e9
@@ -3903,8 +3903,16 @@ static void gtk_imhtml_image_add_to(GtkI
 	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));
 
============================================================
--- pidgin/gtkimhtml.h	d9209faaab008ed27e593bc4f7d3d6a0cfda589b
+++ pidgin/gtkimhtml.h	e556ff88ccfcdf77c592839183a90c09ec42cf9a
@@ -416,17 +416,6 @@ GtkIMHtmlScalable *gtk_imhtml_scalable_n
 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.
============================================================
--- ChangeLog.API	034711525ba80c7ba6ab0a56f753e52e6b5aacd1
+++ ChangeLog.API	50f0c75e7a0376deda803d00e913a8488602c9b7
@@ -87,6 +87,7 @@ version 3.0.0 (??/??/????):
 		* 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
============================================================
--- pidgin/plugins/perl/common/GtkIMHtml.xs	34a3274d396448e628c865274023eac5741b666e
+++ pidgin/plugins/perl/common/GtkIMHtml.xs	2b77481f72eb5b91f2a2461cb27d5da223661d2e
@@ -77,30 +77,10 @@ gtk_imhtml_get_text(imhtml, start, end)
 	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.
-void
 gtk_imhtml_hr_add_to(scale, imhtml, iter)
 	Pidgin::IMHtml::Scalable scale
 	Pidgin::IMHtml imhtml