pidgin3: comparison pidgin/gtkimhtml.h

-:5ecbc7cf4ee1
+:e07993a28f20
 #define GTK_IMHTML_SCALABLE(obj)   ((GtkIMHtmlScalable *)obj)
 #define GTK_IMHTML_ANIMATION(obj)  ((GtkIMHtmlAnimation *)obj)
 typedef struct _GtkIMHtml			GtkIMHtml;
 typedef struct _GtkIMHtmlClass		GtkIMHtmlClass;
-#if !(defined PIDGIN_DISABLE_DEPRECATED) && !(defined _PIDGIN_GTKIMHTML_C_)
-typedef struct _GtkIMHtmlFontDetail	GtkIMHtmlFontDetail;	/* The five elements contained in a FONT tag */
-#endif
 typedef struct _GtkSmileyTree		GtkSmileyTree;
 typedef struct _GtkIMHtmlSmiley		GtkIMHtmlSmiley;
 typedef struct _GtkIMHtmlScalable	GtkIMHtmlScalable;
 typedef struct _GtkIMHtmlImage		GtkIMHtmlImage;
 typedef struct _GtkIMHtmlAnimation	GtkIMHtmlAnimation;
 typedef struct _GtkIMHtmlHr			GtkIMHtmlHr;
 typedef struct _GtkIMHtmlFuncs		GtkIMHtmlFuncs;
-/**
-* @since 2.6.0
-*/
 typedef struct _GtkIMHtmlLink       GtkIMHtmlLink;
 typedef enum {
 	GTK_IMHTML_BOLD =       1 << 0,
 	GTK_IMHTML_ITALIC =     1 << 1,
 	GTK_IMHTML_LINK =       1 << 9,
 	GTK_IMHTML_IMAGE =      1 << 10,
 	GTK_IMHTML_SMILEY =     1 << 11,
 	GTK_IMHTML_LINKDESC =   1 << 12,
 	GTK_IMHTML_STRIKE =     1 << 13,
-	/** Show custom smileys when appropriate. @since 2.5.0 */
+	/** Show custom smileys when appropriate. */
 	GTK_IMHTML_CUSTOM_SMILEY = 1 << 14,
 	GTK_IMHTML_ALL =       -1
 } GtkIMHtmlButtons;
 typedef enum {
 		gchar *fontface;
 		int fontsize;
 		GtkTextTag *link;
 	} edit;
-#if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKIMHTML_C_)
-	/** @deprecated */
-	char *clipboard_text_string;
-	/** @deprecated */
-	char *clipboard_html_string;
-#else
-	char *depr1;
-	char *depr2;
-#endif
 	GSList *im_images;
 	GtkIMHtmlFuncs *funcs;
 	GtkSourceUndoManager *undo_manager;
 };
 	void (*undo)(GtkIMHtml *);
 	void (*redo)(GtkIMHtml *);
 	GList *protocols; /* List of GtkIMHtmlProtocol's */
 };
-#if !(defined PIDGIN_DISABLE_DEPRECATED) && !(defined _PIDGIN_GTKIMHTML_C_)
-/** @deprecated as of 2.7.10 */
-struct _GtkIMHtmlFontDetail {
-	gushort size;
-	gchar *face;
-	gchar *fore;
-	gchar *back;
-	gchar *bg;
-	gchar *sml;
-	gboolean underline;
-	gshort bold;
-};
-#endif
-struct _GtkSmileyTree {
-	GString *values;
-	GtkSmileyTree **children;
-	GtkIMHtmlSmiley *image;
-};
 struct _GtkIMHtmlSmiley {
 	gchar *smile;
 	gchar *file;
 	GdkPixbufAnimation *icon;
 	gboolean hidden;
 	GdkPixbufLoader *loader;
 	GSList *anchors;
 	GtkIMHtmlSmileyFlags flags;
 	GtkIMHtml *imhtml;
-	gpointer data;       /** @since 2.6.0 */
+	gpointer data;
-	gsize datasize;      /** @since 2.6.0 */
+	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,
 * @return A new IM/HTML Scalable object.
 */
 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 a new GTK+ IM/HTML scalable object with an
-* animated image.
-*
-* @param img      A GdkPixbufAnimation 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.
-*
-* @since 2.1.0
-*/
-/*
-* TODO: All this animation code could be combined much better with
-*       the image code.  It couldn't be done when it was written
-*       because it requires breaking backward compatibility.  It
-*       would be good to do it for 3.0.0.
-*/
-GtkIMHtmlScalable *gtk_imhtml_animation_new(GdkPixbufAnimation *img, const gchar *filename, int id);
-/**
-* Destroys and frees a GTK+ IM/HTML scalable image.
-*
-* @param scale The GTK+ IM/HTML scalable.
-*/
-/* TODO: Is there any reason this isn't private? */
-void gtk_imhtml_image_free(GtkIMHtmlScalable *scale);
-/**
-* Destroys and frees a GTK+ IM/HTML scalable animation.
-*
-* @param scale The GTK+ IM/HTML scalable.
-*/
-/* TODO: Is there any reason this isn't private? */
-void gtk_imhtml_animation_free(GtkIMHtmlScalable *scale);
-/**
-* Rescales a GTK+ IM/HTML scalable image to a given size.
-*
-* @param scale  The GTK+ IM/HTML scalable.
-* @param width  The new width.
-* @param height The new height.
-*/
-/* TODO: Is there any reason this isn't private? */
-void gtk_imhtml_image_scale(GtkIMHtmlScalable *scale, int width, int height);
-/**
-* Adds a GTK+ IM/HTML scalable image to a given GTK+ IM/HTML at a given iter.
-*
-* @param scale  The GTK+ IM/HTML scalable.
-* @param imhtml The GTK+ IM/HTML.
-* @param iter   The GtkTextIter at which to add the scalable.
-*/
-/* TODO: Is there any reason this isn't private? */
-void gtk_imhtml_image_add_to(GtkIMHtmlScalable *scale, GtkIMHtml *imhtml, GtkTextIter *iter);
-/**
 * Creates and returns an new GTK+ IM/HTML scalable with a horizontal rule.
 *
 * @return A new IM/HTML Scalable object with an image.
 */
 GtkIMHtmlScalable *gtk_imhtml_hr_new(void);
 /**
 * Setup formatting for an imhtml depending on the flags specified.
 *
 * @param imhtml  The GTK+ IM/HTML.
 * @param flags   The connection flag which describes the allowed types of formatting.
-*
-* @since 2.1.0
 */
 void gtk_imhtml_setup_entry(GtkIMHtml *imhtml, PurpleConnectionFlags flags);
 /**
 * Create a new GtkIMHtmlSmiley.
 * @param shortcut   The key shortcut for the smiley
 * @param hide       @c TRUE if the smiley should be hidden in the smiley dialog, @c FALSE otherwise
 * @param flags      The smiley flags
 *
 * @return The newly created smiley
-* @since 2.5.0
 */
 GtkIMHtmlSmiley *gtk_imhtml_smiley_create(const char *file, const char *shortcut, gboolean hide,
 		GtkIMHtmlSmileyFlags flags);
 /**
 * Reload the image data for the smiley.
 *
 * @param smiley   The smiley to reload
-*
-* @since 2.5.0
 */
 void gtk_imhtml_smiley_reload(GtkIMHtmlSmiley *smiley);
 /**
 * Destroy a GtkIMHtmlSmiley.
 *
 * @param smiley   The smiley to destroy
-*
-* @since 2.5.0
 */
 void gtk_imhtml_smiley_destroy(GtkIMHtmlSmiley *smiley);
 /**
 * Register a protocol with the GtkIMHtml widget. Registering a protocol would
 *                      up on the protocol text. The callback should return
 *                      @c TRUE if the request for context menu was processed
 *                      successfully, @c FALSE otherwise.
 *
 * @return  @c TRUE if the protocol was successfully registered (or unregistered, when \a activate is @c NULL)
-*
-* @since 2.6.0
 */
 gboolean gtk_imhtml_class_register_protocol(const char *name,
 		gboolean (*activate)(GtkIMHtml *imhtml, GtkIMHtmlLink *link),
 		gboolean (*context_menu)(GtkIMHtml *imhtml, GtkIMHtmlLink *link, GtkWidget *menu));
 * Get the URL associated with a link. This should be used by the IMHtml protocol-callbacks.
 *
 * @param link   The GtkIMHtmlLink object sent to the callback functions
 *
 * @return  The URL
-*
-* @since 2.6.0
 */
 const char *gtk_imhtml_link_get_url(GtkIMHtmlLink *link);
 /**
 * Get the GtkTextTag object (if any) associated with a particular link.
 *
 * @param link   The GtkIMHtmlLink object sent to the callback functions
 *
 * @return  The GtkTextTag object, or @c NULL
-*
-* @since 2.6.0
 */
 const GtkTextTag *gtk_imhtml_link_get_text_tag(GtkIMHtmlLink *link);
 /**
 * Activates a GtkIMHtmlLink object. This triggers the 'url-clicked' signal, marks the
 * link as visited (when possible).
 *
 * @param link   The GtkIMHtmlLink object sent to the callback functions
 *
 * @return  @c TRUE if 'url-clicked' signal was emitted, @c FALSE otherwise.
-*
-* @since 2.6.0
 */
 gboolean gtk_imhtml_link_activate(GtkIMHtmlLink *link);
 /**
 * By default this widget intercepts presses of the "return" key and

Mercurial > pidgin3 / file comparison

comparison: pidgin/gtkimhtml.h

pidgin/gtkimhtml.h