From be99f3db8925de2016528d50f32339a73fcd10c8 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Wed, 31 Oct 2007 12:30:29 +0000 Subject: Warning fixes: - NULL vs 0 vs FALSE - ANSIfication of function 2007-10-29 Kjartan Maraas * e-activity-handler.c: (e_activity_handler_new): * e-canvas.c: (e_canvas_new), (emit_event), (pick_current_item), (e_canvas_button): * e-combo-button.c: (menu_detacher), (impl_destroy), (impl_button_press_event): * e-combo-cell-editable.c: (e_combo_cell_editable_new): * e-expander.c: (e_expander_init), (e_expander_size_request), (e_expander_size_allocate), (e_expander_button_press), (e_expander_focus): * e-gui-utils.c: (e_popup_menu), (e_container_change_tab_order_callback): * e-image-chooser.c: (image_drag_data_received_cb): * e-info-label.c: (e_info_label_new): * e-map.c: (e_map_key_press), (e_map_new), (update_render_pixbuf), (blowup_window_area), (zoom_do), (set_scroll_area): * e-pilot-settings.c: (e_pilot_settings_get_source): * e-printable.c: (e_printable_will_fit): * e-reflow.c: (items_inserted), (model_changed), (set_empty), (e_reflow_event), (e_reflow_draw): * e-search-bar.c: (set_option): * e-search-bar.h: * e-unicode.c: (e_xml_get_translated_utf8_string_prop_by_name): Warning fixes: - NULL vs 0 vs FALSE - ANSIfication of function declarations. - Use non-deprecated GSignal functions - Don't mix different enum types svn path=/trunk/; revision=34466 --- widgets/misc/e-reflow.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'widgets/misc/e-reflow.c') diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index 96c2fa8961..a8306ffbb3 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -430,7 +430,7 @@ items_inserted (EReflowModel *model, int position, int count, EReflow *reflow) memmove (reflow->heights + position + count, reflow->heights + position, (reflow->count - position - count) * sizeof (int)); memmove (reflow->items + position + count, reflow->items + position, (reflow->count - position - count) * sizeof (GnomeCanvasItem *)); for (i = position; i < position + count; i++) { - reflow->items[i] = 0; + reflow->items[i] = NULL; reflow->heights[i] = e_reflow_model_height (reflow->model, i, GNOME_CANVAS_GROUP (reflow)); } @@ -485,7 +485,7 @@ model_changed (EReflowModel *model, EReflow *reflow) count = reflow->count; for (i = 0; i < count; i++) { - reflow->items[i] = 0; + reflow->items[i] = NULL; reflow->heights[i] = e_reflow_model_height (reflow->model, i, GNOME_CANVAS_GROUP (reflow)); } @@ -927,11 +927,11 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) if (has_focus) { if (event->key.state & GDK_SHIFT_MASK) { if (i == 0) - return 0; + return FALSE; i--; } else { if (i == count - 1) - return 0; + return FALSE; i++; } @@ -944,7 +944,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) gnome_canvas_item_set(item, "has_focus", (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START, NULL); - return 1; + return TRUE; } } } -- cgit v1.2.3