Commit dd69c4e0 authored by Robert Ancell's avatar Robert Ancell

GtkBuildable: Fix the type of the user_data in GtkBuildable.custom_tag_end

The previous type was a pointer to a pointer, which seems to be a copy-paste
error from GtkBuildable.custom_tag_start which is an out parameter. It was
always cast in use so this is an API break, but not an ABI one.
parent cbb0d7ba
...@@ -256,7 +256,7 @@ gtk_buildable_custom_tag_start (GtkBuildable *buildable, ...@@ -256,7 +256,7 @@ gtk_buildable_custom_tag_start (GtkBuildable *buildable,
* @builder: #GtkBuilder used to construct this object * @builder: #GtkBuilder used to construct this object
* @child: (allow-none): child object or %NULL for non-child tags * @child: (allow-none): child object or %NULL for non-child tags
* @tagname: name of tag * @tagname: name of tag
* @data: (type gpointer): user data that will be passed in to parser functions * @data: user data that will be passed in to parser functions
* *
* This is called at the end of each custom element handled by * This is called at the end of each custom element handled by
* the buildable. * the buildable.
...@@ -266,7 +266,7 @@ gtk_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -266,7 +266,7 @@ gtk_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data) gpointer data)
{ {
GtkBuildableIface *iface; GtkBuildableIface *iface;
......
...@@ -115,7 +115,7 @@ struct _GtkBuildableIface ...@@ -115,7 +115,7 @@ struct _GtkBuildableIface
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data); gpointer data);
void (* custom_finished) (GtkBuildable *buildable, void (* custom_finished) (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
...@@ -164,7 +164,7 @@ void gtk_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -164,7 +164,7 @@ void gtk_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data); gpointer data);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
void gtk_buildable_custom_finished (GtkBuildable *buildable, void gtk_buildable_custom_finished (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
......
...@@ -468,7 +468,7 @@ static void gtk_cell_area_buildable_custom_tag_end (GtkBuildable ...@@ -468,7 +468,7 @@ static void gtk_cell_area_buildable_custom_tag_end (GtkBuildable
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data); gpointer data);
/* Used in foreach loop to check if a child renderer is present */ /* Used in foreach loop to check if a child renderer is present */
typedef struct { typedef struct {
...@@ -1575,7 +1575,7 @@ gtk_cell_area_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -1575,7 +1575,7 @@ gtk_cell_area_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data) gpointer data)
{ {
/* Just ignore the boolean return from here */ /* Just ignore the boolean return from here */
_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data); _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);
......
...@@ -93,7 +93,7 @@ static void gtk_cell_view_buildable_custom_tag_end (GtkBuildable ...@@ -93,7 +93,7 @@ static void gtk_cell_view_buildable_custom_tag_end (GtkBuildable
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data); gpointer data);
static GtkSizeRequestMode gtk_cell_view_get_request_mode (GtkWidget *widget); static GtkSizeRequestMode gtk_cell_view_get_request_mode (GtkWidget *widget);
static void gtk_cell_view_measure (GtkWidget *widget, static void gtk_cell_view_measure (GtkWidget *widget,
...@@ -761,7 +761,7 @@ gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -761,7 +761,7 @@ gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data) gpointer data)
{ {
if (_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, if (_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname,
data)) data))
......
...@@ -320,7 +320,7 @@ static void gtk_combo_box_buildable_custom_tag_end (GtkBuildable *bui ...@@ -320,7 +320,7 @@ static void gtk_combo_box_buildable_custom_tag_end (GtkBuildable *bui
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data); gpointer data);
static GObject *gtk_combo_box_buildable_get_internal_child (GtkBuildable *buildable, static GObject *gtk_combo_box_buildable_get_internal_child (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
const gchar *childname); const gchar *childname);
...@@ -3072,7 +3072,7 @@ gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -3072,7 +3072,7 @@ gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data) gpointer data)
{ {
if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data)) if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data))
parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname, data); parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname, data);
......
...@@ -179,7 +179,7 @@ static void gtk_container_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -179,7 +179,7 @@ static void gtk_container_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data); gpointer data);
/* --- variables --- */ /* --- variables --- */
static GQuark vadjustment_key_id; static GQuark vadjustment_key_id;
...@@ -604,7 +604,7 @@ gtk_container_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -604,7 +604,7 @@ gtk_container_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *parser_data) gpointer parser_data)
{ {
if (strcmp (tagname, "packing") == 0) if (strcmp (tagname, "packing") == 0)
{ {
......
...@@ -447,7 +447,7 @@ gtk_entry_completion_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -447,7 +447,7 @@ gtk_entry_completion_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data) gpointer data)
{ {
/* Just ignore the boolean return from here */ /* Just ignore the boolean return from here */
_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data); _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);
......
...@@ -138,7 +138,7 @@ static void gtk_file_filter_buildable_custom_tag_end (GtkBuildable *b ...@@ -138,7 +138,7 @@ static void gtk_file_filter_buildable_custom_tag_end (GtkBuildable *b
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data); gpointer data);
G_DEFINE_TYPE_WITH_CODE (GtkFileFilter, gtk_file_filter, G_TYPE_INITIALLY_UNOWNED, G_DEFINE_TYPE_WITH_CODE (GtkFileFilter, gtk_file_filter, G_TYPE_INITIALLY_UNOWNED,
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
...@@ -366,7 +366,7 @@ gtk_file_filter_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -366,7 +366,7 @@ gtk_file_filter_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *user_data) gpointer user_data)
{ {
if (strcmp (tagname, "mime-types") == 0 || if (strcmp (tagname, "mime-types") == 0 ||
strcmp (tagname, "patterns") == 0) strcmp (tagname, "patterns") == 0)
......
...@@ -320,7 +320,7 @@ static void gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildab ...@@ -320,7 +320,7 @@ static void gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildab
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data); gpointer data);
static guint icon_view_signals[LAST_SIGNAL] = { 0 }; static guint icon_view_signals[LAST_SIGNAL] = { 0 };
...@@ -6866,7 +6866,7 @@ gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -6866,7 +6866,7 @@ gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data) gpointer data)
{ {
if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder,
child, tagname, data)) child, tagname, data))
......
...@@ -293,7 +293,7 @@ static void gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable ...@@ -293,7 +293,7 @@ static void gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data); gpointer data);
G_DEFINE_TYPE_WITH_CODE (GtkListStore, gtk_list_store, G_TYPE_OBJECT, G_DEFINE_TYPE_WITH_CODE (GtkListStore, gtk_list_store, G_TYPE_OBJECT,
G_ADD_PRIVATE (GtkListStore) G_ADD_PRIVATE (GtkListStore)
...@@ -2626,7 +2626,7 @@ gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable, ...@@ -2626,7 +2626,7 @@ gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *parser_data) gpointer parser_data)
{ {
SubParserData *data = (SubParserData*)parser_data; SubParserData *data = (SubParserData*)parser_data;
......
...@@ -413,7 +413,7 @@ gtk_tree_view_column_custom_tag_end (GtkBuildable *buildable, ...@@ -413,7 +413,7 @@ gtk_tree_view_column_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder, GtkBuilder *builder,
GObject *child, GObject *child,
const gchar *tagname, const gchar *tagname,
gpointer *data) gpointer data)
{ {
/* Just ignore the boolean return from here */ /* Just ignore the boolean return from here */
_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data); _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment