Skip to content

Commit 3970fd5

Browse files
daschuerdaschuer
committed
Fix compiler warnings in eel folder
1 parent 5e1c8c3 commit 3970fd5

4 files changed

+53
-55
lines changed

‎eel/eel-accessibility.c

+4-8
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,10 @@ eel_accessibility_get_gobject (AtkObject *object)
184184
}
185185

186186
static void
187-
eel_accessibility_destroy (gpointer data,
188-
GObject *where_the_object_was)
187+
eel_accessibility_destroy (gpointer data)
189188
{
190-
g_object_set_qdata
191-
(G_OBJECT (data), get_quark_gobject (), NULL);
192-
atk_object_notify_state_change
193-
(ATK_OBJECT (data), ATK_STATE_DEFUNCT, TRUE);
189+
g_object_set_qdata (G_OBJECT (data), get_quark_gobject (), NULL);
190+
atk_object_notify_state_change (ATK_OBJECT (data), ATK_STATE_DEFUNCT, TRUE);
194191
g_object_unref (data);
195192
}
196193

@@ -211,8 +208,7 @@ eel_accessibility_set_atk_object_return (gpointer object,
211208

212209
if (!ATK_IS_GOBJECT_ACCESSIBLE (atk_object)) {
213210
g_object_set_qdata_full
214-
(object, get_quark_accessible (), atk_object,
215-
(GDestroyNotify)eel_accessibility_destroy);
211+
(object, get_quark_accessible (), atk_object, eel_accessibility_destroy);
216212
g_object_set_qdata
217213
(G_OBJECT (atk_object), get_quark_gobject (), object);
218214
}

‎eel/eel-canvas.c

+33-34
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ eel_canvas_item_show (EelCanvasItem *item)
785785

786786
if (item->parent != NULL) {
787787
if (!(item->flags & EEL_CANVAS_ITEM_MAPPED) &&
788-
item->parent->flags & EEL_CANVAS_ITEM_MAPPED)
788+
(item->parent->flags & EEL_CANVAS_ITEM_MAPPED))
789789
(* EEL_CANVAS_ITEM_GET_CLASS (item)->map) (item);
790790
} else {
791791
if (!(item->flags & EEL_CANVAS_ITEM_MAPPED) &&
@@ -1458,7 +1458,7 @@ eel_canvas_group_map (EelCanvasItem *item)
14581458
for (list = group->item_list; list; list = list->next) {
14591459
i = list->data;
14601460

1461-
if (i->flags & EEL_CANVAS_ITEM_VISIBLE &&
1461+
if ((i->flags & EEL_CANVAS_ITEM_VISIBLE) &&
14621462
!(i->flags & EEL_CANVAS_ITEM_MAPPED)) {
14631463
if (!(i->flags & EEL_CANVAS_ITEM_REALIZED))
14641464
(* EEL_CANVAS_ITEM_GET_CLASS (i)->realize) (i);
@@ -1678,8 +1678,8 @@ group_add (EelCanvasGroup *group, EelCanvasItem *item)
16781678
} else
16791679
group->item_list_end = g_list_append (group->item_list_end, item)->next;
16801680

1681-
if (item->flags & EEL_CANVAS_ITEM_VISIBLE &&
1682-
group->item.flags & EEL_CANVAS_ITEM_MAPPED) {
1681+
if ((item->flags & EEL_CANVAS_ITEM_VISIBLE) &&
1682+
(group->item.flags & EEL_CANVAS_ITEM_MAPPED)) {
16831683
if (!(item->flags & EEL_CANVAS_ITEM_REALIZED))
16841684
(* EEL_CANVAS_ITEM_GET_CLASS (item)->realize) (item);
16851685

@@ -1834,19 +1834,19 @@ eel_canvas_set_property (GObject *object,
18341834

18351835
static void
18361836
eel_canvas_accessible_adjustment_changed (GtkAdjustment *adjustment,
1837-
gpointer data)
1837+
AtkObject *obj)
18381838
{
18391839
/* The scrollbars have changed */
18401840

1841-
g_signal_emit_by_name (ATK_OBJECT (data), "visible_data_changed");
1841+
g_signal_emit_by_name (obj, "visible_data_changed");
18421842
}
18431843

18441844
static void
1845-
accessible_destroy_cb (GtkWidget *widget,
1846-
GtkAccessible *accessible)
1845+
accessible_destroy_cb (GtkWidget *widget,
1846+
AtkObject *obj)
18471847
{
1848-
gtk_accessible_set_widget (accessible, NULL);
1849-
atk_object_notify_state_change (ATK_OBJECT (accessible), ATK_STATE_DEFUNCT, TRUE);
1848+
gtk_accessible_set_widget (GTK_ACCESSIBLE(obj), NULL);
1849+
atk_object_notify_state_change (obj, ATK_STATE_DEFUNCT, TRUE);
18501850
}
18511851

18521852
static gboolean
@@ -2124,20 +2124,6 @@ eel_canvas_accessible_ref_state_set (AtkObject *accessible)
21242124
return state_set;
21252125
}
21262126

2127-
static void
2128-
eel_canvas_accessible_class_init (EelCanvasAccessibleClass *klass)
2129-
{
2130-
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
2131-
2132-
accessible_parent_class = g_type_class_peek_parent (klass);
2133-
2134-
atk_class->initialize = eel_canvas_accessible_initialize;
2135-
atk_class->get_n_children = eel_canvas_accessible_get_n_children;
2136-
atk_class->ref_child = eel_canvas_accessible_ref_child;
2137-
/* below adapted from gtkwidgetaccessible.c */
2138-
atk_class->ref_state_set = eel_canvas_accessible_ref_state_set;
2139-
}
2140-
21412127
static void
21422128
eel_canvas_accessible_get_extents (AtkComponent *component,
21432129
gint *x,
@@ -2211,7 +2197,7 @@ eel_canvas_accessible_get_size (AtkComponent *component,
22112197
}
22122198

22132199
static void
2214-
eel_canvas_accessible_component_init(gpointer iface, gpointer data)
2200+
eel_canvas_accessible_component_init (gpointer iface, gpointer data)
22152201
{
22162202
AtkComponentIface *component;
22172203

@@ -2222,14 +2208,28 @@ eel_canvas_accessible_component_init(gpointer iface, gpointer data)
22222208
component->get_size = eel_canvas_accessible_get_size;
22232209
}
22242210

2211+
G_DEFINE_TYPE_WITH_CODE (EelCanvasAccessible, eel_canvas_accessible, GTK_TYPE_ACCESSIBLE,
2212+
G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, eel_canvas_accessible_component_init))
2213+
2214+
static void
2215+
eel_canvas_accessible_class_init (EelCanvasAccessibleClass *klass)
2216+
{
2217+
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
2218+
2219+
accessible_parent_class = g_type_class_peek_parent (klass);
2220+
2221+
atk_class->initialize = eel_canvas_accessible_initialize;
2222+
atk_class->get_n_children = eel_canvas_accessible_get_n_children;
2223+
atk_class->ref_child = eel_canvas_accessible_ref_child;
2224+
/* below adapted from gtkwidgetaccessible.c */
2225+
atk_class->ref_state_set = eel_canvas_accessible_ref_state_set;
2226+
}
2227+
22252228
static void
22262229
eel_canvas_accessible_init (EelCanvasAccessible *accessible)
22272230
{
22282231
}
22292232

2230-
G_DEFINE_TYPE_WITH_CODE (EelCanvasAccessible, eel_canvas_accessible, GTK_TYPE_ACCESSIBLE,
2231-
G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, eel_canvas_accessible_component_init))
2232-
22332233
static AtkObject *
22342234
eel_canvas_accessible_create (GObject *for_object)
22352235
{
@@ -2490,7 +2490,7 @@ eel_canvas_map (GtkWidget *widget)
24902490

24912491
/* Map items */
24922492

2493-
if (canvas->root->flags & EEL_CANVAS_ITEM_VISIBLE &&
2493+
if ((canvas->root->flags & EEL_CANVAS_ITEM_VISIBLE) &&
24942494
!(canvas->root->flags & EEL_CANVAS_ITEM_MAPPED) &&
24952495
EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->map)
24962496
(* EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->map) (canvas->root);
@@ -2729,7 +2729,7 @@ emit_event (EelCanvas *canvas, GdkEvent *event)
27292729
}
27302730

27312731
if (canvas->grabbed_item) {
2732-
switch (event->type) {
2732+
switch ((int) event->type) {
27332733
case GDK_ENTER_NOTIFY:
27342734
mask = GDK_ENTER_NOTIFY_MASK;
27352735
break;
@@ -2775,7 +2775,7 @@ emit_event (EelCanvas *canvas, GdkEvent *event)
27752775

27762776
ev = *event;
27772777

2778-
switch (ev.type)
2778+
switch ((int) ev.type)
27792779
{
27802780
case GDK_ENTER_NOTIFY:
27812781
case GDK_LEAVE_NOTIFY:
@@ -3025,7 +3025,7 @@ eel_canvas_button (GtkWidget *widget, GdkEventButton *event)
30253025
mask = 0;
30263026
}
30273027

3028-
switch (event->type) {
3028+
switch ((int) event->type) {
30293029
case GDK_BUTTON_PRESS:
30303030
case GDK_2BUTTON_PRESS:
30313031
case GDK_3BUTTON_PRESS:
@@ -3512,7 +3512,6 @@ eel_canvas_set_pixels_per_unit (EelCanvas *canvas, double n)
35123512
*/
35133513
window = NULL;
35143514
if (gtk_widget_get_mapped (widget)) {
3515-
GtkAllocation allocation;
35163515
attributes.window_type = GDK_WINDOW_CHILD;
35173516
gtk_widget_get_allocation (widget, &allocation);
35183517
attributes.x = allocation.x;
@@ -3845,7 +3844,7 @@ static gboolean
38453844
boolean_handled_accumulator (GSignalInvocationHint *ihint,
38463845
GValue *return_accu,
38473846
const GValue *handler_return,
3848-
gpointer dummy)
3847+
gpointer data)
38493848
{
38503849
gboolean signal_handled;
38513850

‎eel/eel-editable-label.c

+7-4
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ enum {
5959
static guint signals[LAST_SIGNAL] = { 0 };
6060

6161
static void eel_editable_label_editable_init (GtkEditableInterface *iface);
62-
static void eel_editable_label_class_init (EelEditableLabelClass *klass);
63-
static void eel_editable_label_init (EelEditableLabel *label);
6462
static void eel_editable_label_set_property (GObject *object,
6563
guint prop_id,
6664
const GValue *value,
@@ -1015,7 +1013,7 @@ eel_editable_label_ensure_layout (EelEditableLabel *label,
10151013
pango_layout_set_justify (label->layout, TRUE);
10161014
break;
10171015
default:
1018-
g_assert_not_reached();
1016+
g_assert_not_reached ();
10191017
}
10201018

10211019
pango_layout_set_alignment (label->layout, align);
@@ -2721,6 +2719,7 @@ eel_editable_label_move_cursor (EelEditableLabel *label,
27212719
break;
27222720
case GTK_MOVEMENT_PARAGRAPHS:
27232721
case GTK_MOVEMENT_PAGES:
2722+
case GTK_MOVEMENT_HORIZONTAL_PAGES:
27242723
break;
27252724
default:
27262725
g_assert_not_reached ();
@@ -2761,6 +2760,7 @@ eel_editable_label_move_cursor (EelEditableLabel *label,
27612760
break;
27622761
case GTK_MOVEMENT_PARAGRAPHS:
27632762
case GTK_MOVEMENT_PAGES:
2763+
case GTK_MOVEMENT_HORIZONTAL_PAGES:
27642764
break;
27652765
default:
27662766
g_assert_not_reached ();
@@ -2858,6 +2858,9 @@ eel_editable_label_delete_from_cursor (EelEditableLabel *label,
28582858
case GTK_DELETE_WHITESPACE:
28592859
/* TODO eel_editable_label_delete_whitespace (label); */
28602860
break;
2861+
default:
2862+
g_assert_not_reached ();
2863+
break;
28612864
}
28622865

28632866
eel_editable_label_pend_cursor_blink (label);
@@ -3368,7 +3371,7 @@ typedef struct {
33683371
GailTextUtil *textutil;
33693372
gint selection_anchor;
33703373
gint selection_end;
3371-
gchar *signal_name;
3374+
const gchar *signal_name;
33723375
gint position;
33733376
gint length;
33743377
} EelEditableLabelAccessiblePrivate;

‎eel/eel-glib-extensions.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -316,22 +316,22 @@ eel_self_check_glib_extensions (void)
316316
/* eel_g_list_partition */
317317

318318
list_to_partition = NULL;
319-
list_to_partition = g_list_append (list_to_partition, "Cadillac");
320-
list_to_partition = g_list_append (list_to_partition, "Pontiac");
321-
list_to_partition = g_list_append (list_to_partition, "Ford");
322-
list_to_partition = g_list_append (list_to_partition, "Range Rover");
319+
list_to_partition = g_list_append (list_to_partition, (gpointer) "Cadillac");
320+
list_to_partition = g_list_append (list_to_partition, (gpointer) "Pontiac");
321+
list_to_partition = g_list_append (list_to_partition, (gpointer) "Ford");
322+
list_to_partition = g_list_append (list_to_partition, (gpointer) "Range Rover");
323323

324324
expected_passed = NULL;
325-
expected_passed = g_list_append (expected_passed, "Cadillac");
326-
expected_passed = g_list_append (expected_passed, "Ford");
325+
expected_passed = g_list_append (expected_passed, (gpointer) "Cadillac");
326+
expected_passed = g_list_append (expected_passed, (gpointer) "Ford");
327327

328328
expected_failed = NULL;
329-
expected_failed = g_list_append (expected_failed, "Pontiac");
330-
expected_failed = g_list_append (expected_failed, "Range Rover");
329+
expected_failed = g_list_append (expected_failed, (gpointer) "Pontiac");
330+
expected_failed = g_list_append (expected_failed, (gpointer) "Range Rover");
331331

332332
actual_passed = eel_g_list_partition (list_to_partition,
333333
eel_test_predicate,
334-
"m",
334+
(gpointer) "m",
335335
&actual_failed);
336336

337337
EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (expected_passed, actual_passed), TRUE);

0 commit comments

Comments
 (0)