projects/aports·blob master · refs

81 lines · 3.2 KiB

1Patch-Source: https://salsa.debian.org/debian/clipit/-/blob/debian/1.4.5+git20210313-3/debian/patches/incompatible-pointer-types.patch
2
3Author: Andreas Beckmann <[email protected]>
4Description: fix building with -Werror=incompatible-pointer-types
5
6--- a/src/keybinder.c
7+++ b/src/keybinder.c
8@@ -310,7 +310,7 @@ keybinder_is_modifier (guint keycode)
9 gboolean retval = FALSE;
10
11 mod_keymap = XGetModifierMapping (
12- GDK_WINDOW_XDISPLAY(gdk_display_get_default()));
13+ GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
14
15 map_size = 8 * mod_keymap->max_keypermod;
16
17--- a/src/main.c
18+++ b/src/main.c
19@@ -614,7 +614,7 @@ void underline_match(char* match, GtkMen
20 PangoAttrList* attr_list = pango_attr_list_new();
21 pango_attr_list_insert (attr_list, underline);
22
23- GtkWidget* gtk_label = gtk_bin_get_child (GTK_BIN (menu_item));
24+ GtkLabel* gtk_label = (GtkLabel *) gtk_bin_get_child (GTK_BIN (menu_item));
25 gtk_label_set_attributes (gtk_label, attr_list);
26 }
27
28@@ -638,7 +638,7 @@ gboolean selected_by_input(const GtkWidg
29 append_to_input_buffer(event->string);
30
31 GtkMenuShell* menu = (GtkMenuShell *) history_menu;
32- GList* element = gtk_container_get_children(menu);
33+ GList* element = gtk_container_get_children((GtkContainer *) menu);
34 GtkMenuItem *menu_item, *first_match = 0;
35
36 const gchar* menu_label;
37@@ -657,9 +657,9 @@ gboolean selected_by_input(const GtkWidg
38 first_match = menu_item;
39 match_count++;
40 underline_match(match, menu_item, menu_label);
41- gtk_widget_set_sensitive(menu_item, true);
42+ gtk_widget_set_sensitive((GtkWidget *) menu_item, true);
43 } else {
44- gtk_widget_set_sensitive(menu_item, false);
45+ gtk_widget_set_sensitive((GtkWidget *) menu_item, false);
46 }
47 element = element->next;
48 count++;
49@@ -667,7 +667,7 @@ gboolean selected_by_input(const GtkWidg
50
51 if (first_match && match_count != prefs.items_menu) {
52 gtk_menu_item_select(first_match);
53- gtk_menu_shell_select_item(menu, first_match);
54+ gtk_menu_shell_select_item(menu, (GtkWidget *) first_match);
55 return TRUE;
56 }
57 return FALSE;
58--- a/src/preferences.c
59+++ b/src/preferences.c
60@@ -723,7 +723,7 @@ void show_preferences(gint tab) {
61 *alignment, *hbox,
62 *vbox;
63
64- GtkWidget *adjustment, *adjustment_small, *adjustment_statics;
65+ GtkAdjustment *adjustment, *adjustment_small, *adjustment_statics;
66 GtkTreeViewColumn *tree_column;
67
68 /* Create the dialog */
69@@ -898,9 +898,9 @@ void show_preferences(gint tab) {
70 gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50);
71 gtk_box_pack_start((GtkBox*)hbox, label, FALSE, FALSE, 0);
72 ellipsize_combo = gtk_combo_box_text_new();
73- gtk_combo_box_text_append_text((GtkComboBox*)ellipsize_combo, _("Beginning"));
74- gtk_combo_box_text_append_text((GtkComboBox*)ellipsize_combo, _("Middle"));
75- gtk_combo_box_text_append_text((GtkComboBox*)ellipsize_combo, _("End"));
76+ gtk_combo_box_text_append_text((GtkComboBoxText*)ellipsize_combo, _("Beginning"));
77+ gtk_combo_box_text_append_text((GtkComboBoxText*)ellipsize_combo, _("Middle"));
78+ gtk_combo_box_text_append_text((GtkComboBoxText*)ellipsize_combo, _("End"));
79 gtk_box_pack_start((GtkBox*)hbox, ellipsize_combo, FALSE, FALSE, 0);
80 gtk_box_pack_start((GtkBox*)vbox_history, frame, FALSE, FALSE, 0);
81