[gtk: 1/2] GtkBuildable: Fix the type of the user_data in GtkBuildable.custom_tag_end
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 1/2] GtkBuildable: Fix the type of the user_data in GtkBuildable.custom_tag_end
- Date: Wed, 10 Oct 2018 11:09:47 +0000 (UTC)
commit dd69c4e0f211fa14f58dcbdf6f1eeaa6913afe83
Author: Robert Ancell <robert ancell canonical com>
Date: Mon Oct 8 11:34:43 2018 +1300
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.
gtk/gtkbuildable.c | 4 ++--
gtk/gtkbuildable.h | 4 ++--
gtk/gtkcellarea.c | 4 ++--
gtk/gtkcellview.c | 4 ++--
gtk/gtkcombobox.c | 4 ++--
gtk/gtkcontainer.c | 4 ++--
gtk/gtkentrycompletion.c | 2 +-
gtk/gtkfilefilter.c | 4 ++--
gtk/gtkiconview.c | 4 ++--
gtk/gtkliststore.c | 4 ++--
gtk/gtktreeviewcolumn.c | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c
index 0be820373a..cb699e5594 100644
--- a/gtk/gtkbuildable.c
+++ b/gtk/gtkbuildable.c
@@ -256,7 +256,7 @@ gtk_buildable_custom_tag_start (GtkBuildable *buildable,
* @builder: #GtkBuilder used to construct this object
* @child: (allow-none): child object or %NULL for non-child tags
* @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
* the buildable.
@@ -266,7 +266,7 @@ gtk_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data)
+ gpointer data)
{
GtkBuildableIface *iface;
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 911dfe32c7..ba899fa1f8 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -115,7 +115,7 @@ struct _GtkBuildableIface
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data);
+ gpointer data);
void (* custom_finished) (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
@@ -164,7 +164,7 @@ void gtk_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data);
+ gpointer data);
GDK_AVAILABLE_IN_ALL
void gtk_buildable_custom_finished (GtkBuildable *buildable,
GtkBuilder *builder,
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index bccaa06efa..3fc37a3dac 100644
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -468,7 +468,7 @@ static void gtk_cell_area_buildable_custom_tag_end (GtkBuildable
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data);
+ gpointer data);
/* Used in foreach loop to check if a child renderer is present */
typedef struct {
@@ -1575,7 +1575,7 @@ gtk_cell_area_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data)
+ gpointer data)
{
/* Just ignore the boolean return from here */
_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index ae52674ac3..6310cf78a9 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -93,7 +93,7 @@ static void gtk_cell_view_buildable_custom_tag_end (GtkBuildable
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data);
+ gpointer data);
static GtkSizeRequestMode gtk_cell_view_get_request_mode (GtkWidget *widget);
static void gtk_cell_view_measure (GtkWidget *widget,
@@ -761,7 +761,7 @@ gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data)
+ gpointer data)
{
if (_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname,
data))
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 792d2ebb28..553b9498ad 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -320,7 +320,7 @@ static void gtk_combo_box_buildable_custom_tag_end (GtkBuildable *bui
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data);
+ gpointer data);
static GObject *gtk_combo_box_buildable_get_internal_child (GtkBuildable *buildable,
GtkBuilder *builder,
const gchar *childname);
@@ -3072,7 +3072,7 @@ gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data)
+ gpointer 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);
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index ed83b036e6..7bb9524658 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -179,7 +179,7 @@ static void gtk_container_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data);
+ gpointer data);
/* --- variables --- */
static GQuark vadjustment_key_id;
@@ -604,7 +604,7 @@ gtk_container_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *parser_data)
+ gpointer parser_data)
{
if (strcmp (tagname, "packing") == 0)
{
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index acb7f04425..0919deae78 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -447,7 +447,7 @@ gtk_entry_completion_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data)
+ gpointer data)
{
/* Just ignore the boolean return from here */
_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index a63d2ecce3..b7a038e17c 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -138,7 +138,7 @@ static void gtk_file_filter_buildable_custom_tag_end (GtkBuildable *b
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data);
+ gpointer data);
G_DEFINE_TYPE_WITH_CODE (GtkFileFilter, gtk_file_filter, G_TYPE_INITIALLY_UNOWNED,
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
@@ -366,7 +366,7 @@ gtk_file_filter_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *user_data)
+ gpointer user_data)
{
if (strcmp (tagname, "mime-types") == 0 ||
strcmp (tagname, "patterns") == 0)
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 160bd6b2c8..45f37b347e 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -320,7 +320,7 @@ static void gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildab
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data);
+ gpointer data);
static guint icon_view_signals[LAST_SIGNAL] = { 0 };
@@ -6866,7 +6866,7 @@ gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data)
+ gpointer data)
{
if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder,
child, tagname, data))
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 260623ede1..6c4d0de601 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -293,7 +293,7 @@ static void gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data);
+ gpointer data);
G_DEFINE_TYPE_WITH_CODE (GtkListStore, gtk_list_store, G_TYPE_OBJECT,
G_ADD_PRIVATE (GtkListStore)
@@ -2626,7 +2626,7 @@ gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *parser_data)
+ gpointer parser_data)
{
SubParserData *data = (SubParserData*)parser_data;
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index a4ae3145dd..0d7a3140a1 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -413,7 +413,7 @@ gtk_tree_view_column_custom_tag_end (GtkBuildable *buildable,
GtkBuilder *builder,
GObject *child,
const gchar *tagname,
- gpointer *data)
+ gpointer data)
{
/* Just ignore the boolean return from here */
_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
