pidgin: 39b6d893: Hide unused gtkimhtml structs (aka, the ...

qulogic at pidgin.im qulogic at pidgin.im
Sat Oct 15 20:20:47 EDT 2011


----------------------------------------------------------------------
Revision: 39b6d8938eac926f7c3e8db1eb0280b8da53b3c6
Parent:   fa8d18266b8cb924af4e65d8970175c0d8b7fffa
Author:   qulogic at pidgin.im
Date:     10/15/11 19:11:35
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/39b6d8938eac926f7c3e8db1eb0280b8da53b3c6

Changelog: 

Hide unused gtkimhtml structs (aka, the easy ones).

Changes against parent fa8d18266b8cb924af4e65d8970175c0d8b7fffa

  patched  ChangeLog.API
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtml.h

-------------- next part --------------
============================================================
--- pidgin/gtkimhtml.c	8582542bb005869a469c102865df4937898cbaab
+++ pidgin/gtkimhtml.c	93b2b9713b8ad5bdef30d3074bd8229270c8fe61
@@ -83,6 +83,36 @@ struct im_image_data {
 	GtkTextMark *mark;
 };
 
+struct _GtkIMHtmlScalable {
+	void (*scale)(struct _GtkIMHtmlScalable *, int, int);
+	void (*add_to)(struct _GtkIMHtmlScalable *, GtkIMHtml *, GtkTextIter *);
+	void (*free)(struct _GtkIMHtmlScalable *);
+};
+
+struct _GtkIMHtmlHr {
+	GtkIMHtmlScalable scalable;
+	GtkWidget *sep;
+};
+
+struct _GtkIMHtmlImage {
+	GtkIMHtmlScalable scalable;
+	GtkImage *image; /**< Contains the scaled version of this pixbuf. */
+	GdkPixbuf *pixbuf; /**< The original pixbuf, before any scaling. */
+	GtkTextMark *mark;
+	gchar *filename;
+	int width;
+	int height;
+	int id;
+	GtkWidget *filesel;
+};
+
+struct _GtkIMHtmlAnimation {
+	GtkIMHtmlImage imhtmlimage;
+	GdkPixbufAnimation *anim; /**< The original animation, before any scaling. */
+	GdkPixbufAnimationIter *iter;
+	guint timer;
+};
+
 struct _GtkIMHtmlLink
 {
 	GtkIMHtml *imhtml;
@@ -90,6 +120,12 @@ struct _GtkIMHtmlLink
 	GtkTextTag *tag;
 };
 
+struct _GtkSmileyTree {
+	GString *values;
+	GtkSmileyTree **children;
+	GtkIMHtmlSmiley *image;
+};
+
 typedef struct {
 	char *name;
 	int length;
============================================================
--- pidgin/gtkimhtml.h	3f9fdaf82449f461aababab5acdcc786b48bc408
+++ pidgin/gtkimhtml.h	6ca6531f1c7563ea5eb7f80a943f4ebd4651cf46
@@ -148,12 +148,6 @@ struct _GtkIMHtmlClass {
 	GList *protocols; /* List of GtkIMHtmlProtocol's */
 };
 
-struct _GtkSmileyTree {
-	GString *values;
-	GtkSmileyTree **children;
-	GtkIMHtmlSmiley *image;
-};
-
 struct _GtkIMHtmlSmiley {
 	gchar *smile;
 	gchar *file;
@@ -167,36 +161,6 @@ struct _GtkIMHtmlSmiley {
 	gsize datasize;
 };
 
-struct _GtkIMHtmlScalable {
-	void (*scale)(struct _GtkIMHtmlScalable *, int, int);
-	void (*add_to)(struct _GtkIMHtmlScalable *, GtkIMHtml *, GtkTextIter *);
-	void (*free)(struct _GtkIMHtmlScalable *);
-};
-
-struct _GtkIMHtmlImage {
-	GtkIMHtmlScalable scalable;
-	GtkImage *image; /**< Contains the scaled version of this pixbuf. */
-	GdkPixbuf *pixbuf; /**< The original pixbuf, before any scaling. */
-	GtkTextMark *mark;
-	gchar *filename;
-	int width;
-	int height;
-	int id;
-	GtkWidget *filesel;
-};
-
-struct _GtkIMHtmlAnimation {
-	GtkIMHtmlImage imhtmlimage;
-	GdkPixbufAnimation *anim; /**< The original animation, before any scaling. */
-	GdkPixbufAnimationIter *iter;
-	guint timer;
-};
-
-struct _GtkIMHtmlHr {
-	GtkIMHtmlScalable scalable;
-	GtkWidget *sep;
-};
-
 typedef enum {
 	GTK_IMHTML_NO_COLOURS          = 1 << 0,
 	GTK_IMHTML_NO_FONTS            = 1 << 1,
============================================================
--- ChangeLog.API	ebac01676bdccbd6f39693d82c5b9939ac5c2fd8
+++ ChangeLog.API	a6cbbb057dbdf4865817cc9030eee01fcef40bfd
@@ -190,7 +190,12 @@ version 3.0.0 (??/??/????):
 		* PurplePluginProtocolInfo.get_cb_away
 		* serv_got_attention
 		* serv_send_attention
+		* struct _GtkIMHtmlAnimation
 		* struct _GtkIMHtmlFontDetail
+		* struct _GtkIMHtmlHr
+		* struct _GtkIMHtmlImage
+		* struct _GtkIMHtmlScalable
+		* struct _GtkSmileyTree
 		* struct _PidginChatPane
 		* struct _PidginImPane
 		* struct _PurpleAttentionType


More information about the Commits mailing list