[gtk/gtk-3-22] gtk: Cast g_object_ref() to the right type
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-22] gtk: Cast g_object_ref() to the right type
- Date: Sun, 11 Feb 2018 23:35:52 +0000 (UTC)
commit ade22d00f26ee7463a39a8631b9e1271c6b0d09f
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sun Feb 11 16:22:49 2018 +0000
gtk: Cast g_object_ref() to the right type
In GLib 2.56, g_object_ref() will check that you're assigning the return
value to a variable of the same type you're passing in.
gtk/gtkcellrendererspin.c | 2 +-
gtk/gtkcolorplane.c | 6 +++---
gtk/gtkcomboboxtext.c | 2 +-
gtk/gtkcssimagefallback.c | 2 +-
gtk/gtkcssimagegradient.c | 2 +-
gtk/gtkcssimagescaled.c | 2 +-
gtk/gtklabel.c | 2 +-
gtk/gtksidebarrow.c | 4 ++--
gtk/gtktoolpalette.c | 2 +-
gtk/gtktreeview.c | 2 +-
gtk/gtkwidget.c | 2 +-
11 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index c20c46cd5b..e4e9aba6bc 100644
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -226,7 +226,7 @@ gtk_cell_renderer_spin_set_property (GObject *object,
}
if (obj)
- priv->adjustment = g_object_ref_sink (obj);
+ priv->adjustment = GTK_ADJUSTMENT (g_object_ref_sink (obj));
break;
case PROP_CLIMB_RATE:
priv->climb_rate = g_value_get_double (value);
diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
index cfb9a5983b..910f7a0801 100644
--- a/gtk/gtkcolorplane.c
+++ b/gtk/gtkcolorplane.c
@@ -462,7 +462,7 @@ plane_set_property (GObject *object,
adjustment = g_value_get_object (value);
if (adjustment)
{
- plane->priv->h_adj = g_object_ref_sink (adjustment);
+ plane->priv->h_adj = GTK_ADJUSTMENT (g_object_ref_sink (adjustment));
g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (h_changed), plane);
}
break;
@@ -470,7 +470,7 @@ plane_set_property (GObject *object,
adjustment = g_value_get_object (value);
if (adjustment)
{
- plane->priv->s_adj = g_object_ref_sink (adjustment);
+ plane->priv->s_adj = GTK_ADJUSTMENT (g_object_ref_sink (adjustment));
g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (sv_changed), plane);
}
break;
@@ -478,7 +478,7 @@ plane_set_property (GObject *object,
adjustment = g_value_get_object (value);
if (adjustment)
{
- plane->priv->v_adj = g_object_ref_sink (adjustment);
+ plane->priv->v_adj = GTK_ADJUSTMENT (g_object_ref_sink (adjustment));
g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (sv_changed), plane);
}
break;
diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
index 4b15c04028..e70f323ae3 100644
--- a/gtk/gtkcomboboxtext.c
+++ b/gtk/gtkcomboboxtext.c
@@ -292,7 +292,7 @@ gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable,
data = g_slice_new0 (ItemParserData);
data->builder = g_object_ref (builder);
- data->object = g_object_ref (buildable);
+ data->object = G_OBJECT (g_object_ref (buildable));
data->domain = gtk_builder_get_translation_domain (builder);
data->string = g_string_new ("");
diff --git a/gtk/gtkcssimagefallback.c b/gtk/gtkcssimagefallback.c
index 08206b8204..59d49b9f9e 100644
--- a/gtk/gtkcssimagefallback.c
+++ b/gtk/gtkcssimagefallback.c
@@ -174,7 +174,7 @@ gtk_css_image_fallback_compute (GtkCssImage *image,
return GTK_CSS_IMAGE (copy);
}
else
- return g_object_ref (fallback);
+ return GTK_CSS_IMAGE (g_object_ref (fallback));
}
static gboolean
diff --git a/gtk/gtkcssimagegradient.c b/gtk/gtkcssimagegradient.c
index 6ba993ba25..43f9c727e2 100644
--- a/gtk/gtkcssimagegradient.c
+++ b/gtk/gtkcssimagegradient.c
@@ -41,7 +41,7 @@ gtk_css_image_gradient_compute (GtkCssImage *image,
GtkCssImageGradient *copy;
if (gradient->pattern)
- return g_object_ref (gradient);
+ return GTK_CSS_IMAGE (g_object_ref (gradient));
copy = g_object_new (GTK_TYPE_CSS_IMAGE_GRADIENT, NULL);
copy->gradient = gtk_gradient_ref (gradient->gradient);
diff --git a/gtk/gtkcssimagescaled.c b/gtk/gtkcssimagescaled.c
index 1169f10700..004a11b087 100644
--- a/gtk/gtkcssimagescaled.c
+++ b/gtk/gtkcssimagescaled.c
@@ -107,7 +107,7 @@ gtk_css_image_scaled_compute (GtkCssImage *image,
scale = MAX(MIN (scale, scaled->n_images), 1);
if (scaled->scale == scale)
- return g_object_ref (scaled);
+ return GTK_CSS_IMAGE (g_object_ref (scaled));
else
{
copy = g_object_new (_gtk_css_image_scaled_get_type (), NULL);
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 88e47d205a..1a2453ff5e 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1706,7 +1706,7 @@ gtk_label_buildable_custom_tag_start (GtkBuildable *buildable,
parser_data = g_slice_new0 (PangoParserData);
parser_data->builder = g_object_ref (builder);
- parser_data->object = g_object_ref (buildable);
+ parser_data->object = G_OBJECT (g_object_ref (buildable));
*parser = pango_parser;
*data = parser_data;
return TRUE;
diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c
index 8b6715dd10..effbb1fb3b 100644
--- a/gtk/gtksidebarrow.c
+++ b/gtk/gtksidebarrow.c
@@ -225,7 +225,7 @@ gtk_sidebar_row_set_property (GObject *object,
object = g_value_get_object (value);
if (object != NULL)
{
- self->start_icon = g_object_ref (object);
+ self->start_icon = G_ICON (g_object_ref (object));
gtk_image_set_from_gicon (GTK_IMAGE (self->start_icon_widget),
self->start_icon,
GTK_ICON_SIZE_MENU);
@@ -243,7 +243,7 @@ gtk_sidebar_row_set_property (GObject *object,
object = g_value_get_object (value);
if (object != NULL)
{
- self->end_icon = g_object_ref (object);
+ self->end_icon = G_ICON (g_object_ref (object));
gtk_image_set_from_gicon (GTK_IMAGE (self->end_icon_widget),
self->end_icon,
GTK_ICON_SIZE_MENU);
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index eb9003e33f..b826663bae 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -788,7 +788,7 @@ gtk_tool_palette_add (GtkContainer *container,
g_ptr_array_add (palette->priv->groups, info);
info->pos = palette->priv->groups->len - 1;
- info->widget = g_object_ref_sink (child);
+ info->widget = (GtkToolItemGroup *) g_object_ref_sink (child);
gtk_widget_set_parent (child, GTK_WIDGET (palette));
}
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 73d355798e..28165420fd 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -14981,7 +14981,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
if (entry)
{
- tree_view->priv->search_entry = g_object_ref (entry);
+ tree_view->priv->search_entry = GTK_WIDGET (g_object_ref (entry));
tree_view->priv->search_custom_entry_set = TRUE;
if (tree_view->priv->search_entry_changed_id == 0)
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 35ad5b2159..13421eab69 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -14409,7 +14409,7 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable,
AccelGroupParserData *data;
data = g_slice_new0 (AccelGroupParserData);
- data->object = g_object_ref (buildable);
+ data->object = G_OBJECT (g_object_ref (buildable));
data->builder = builder;
*parser = accel_group_parser;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]