1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
https://bugs.gentoo.org/880617
From 81c42586e6d9db7434e9b3f657fbd238294dd9d9 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Sat, 13 May 2023 11:35:28 -0400
Subject: [PATCH] Fix casts
---
gtk/gtkcellrendererspin.c | 2 +-
gtk/gtkcomboboxtext.c | 2 +-
gtk/gtkimmodule.c | 2 +-
gtk/gtklabel.c | 2 +-
gtk/gtkscale.c | 2 +-
gtk/gtktoolpalette.c | 2 +-
gtk/gtktreeview.c | 2 +-
gtk/gtkuimanager.c | 2 +-
gtk/gtkwidget.c | 2 +-
modules/other/gail/gailtreeview.c | 2 +-
modules/printbackends/cups/gtkprintbackendcups.c | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index 2a3961bf20..68e5b9aaae 100644
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -207,7 +207,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/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
index 9ffba68766..42c51abebc 100644
--- a/gtk/gtkcomboboxtext.c
+++ b/gtk/gtkcomboboxtext.c
@@ -275,7 +275,7 @@ gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable,
parser_data = g_slice_new0 (ItemParserData);
parser_data->builder = g_object_ref (builder);
- parser_data->object = g_object_ref (buildable);
+ parser_data->object = G_OBJECT (g_object_ref (buildable));
parser_data->domain = gtk_builder_get_translation_domain (builder);
*parser = item_parser;
*data = parser_data;
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 1fcb17a7d8..445b2be87f 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -662,7 +662,7 @@ lookup_immodule (gchar **immodules_list)
gboolean found;
gchar *context_id;
found = g_hash_table_lookup_extended (contexts_hash, *immodules_list,
- &context_id, NULL);
+ (gpointer *) &context_id, NULL);
if (found)
return context_id;
}
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index c47de5924f..cf68685536 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1336,7 +1336,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/gtkscale.c b/gtk/gtkscale.c
index 4317523fb8..a573b2f6ba 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale *scale,
mark->position = position;
priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark,
- (GCompareFunc) compare_marks,
+ compare_marks,
GINT_TO_POINTER (
gtk_range_get_inverted (GTK_RANGE (scale))
));
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index b984193ca3..f64b552fb0 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -734,7 +734,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 89301eb91d..0d2d15b488 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -14147,7 +14147,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/gtkuimanager.c b/gtk/gtkuimanager.c
index d004cf1ed3..8cbeda9e85 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -503,7 +503,7 @@ gtk_ui_manager_buildable_construct_child (GtkBuildable *buildable,
g_signal_connect (widget, "hierarchy-changed",
G_CALLBACK (child_hierarchy_changed_cb),
GTK_UI_MANAGER (buildable));
- return g_object_ref (widget);
+ return G_OBJECT (g_object_ref (widget));
}
static void
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 1d1f6bb60e..a2ae2b430f 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -10679,7 +10679,7 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable,
AccelGroupParserData *parser_data;
parser_data = g_slice_new0 (AccelGroupParserData);
- parser_data->object = g_object_ref (buildable);
+ parser_data->object = G_OBJECT (g_object_ref (buildable));
*parser = accel_group_parser;
*data = parser_data;
return TRUE;
diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c
index 23923c59a1..ac6ff0a1c4 100644
--- a/modules/other/gail/gailtreeview.c
+++ b/modules/other/gail/gailtreeview.c
@@ -995,7 +995,7 @@ gail_tree_view_ref_child (AtkObject *obj,
gail_cell_add_state (cell, ATK_STATE_FOCUSABLE, FALSE);
if (focus_index == i)
{
- gailview->focus_cell = g_object_ref (cell);
+ gailview->focus_cell = ATK_OBJECT (g_object_ref (cell));
gail_cell_add_state (cell, ATK_STATE_FOCUSED, FALSE);
g_signal_emit_by_name (gailview,
"active-descendant-changed",
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 2a000dc16f..753c53cb89 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -3479,7 +3479,7 @@ cups_request_ppd (GtkPrinter *printer)
g_io_channel_set_encoding (data->ppd_io, NULL, NULL);
g_io_channel_set_close_on_unref (data->ppd_io, TRUE);
- data->printer = g_object_ref (printer);
+ data->printer = GTK_PRINTER_CUPS (g_object_ref (printer));
resource = g_strdup_printf ("/printers/%s.ppd",
gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
--
2.39.3
|
GitWeb