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