From 87b3e9277fde5e764c2dfdce6bc848afe84ef137 Mon Sep 17 00:00:00 2001 From: George Lebl Date: Wed, 29 Aug 2001 01:30:26 +0000 Subject: Patch to fix few 64bit issues Tue Aug 28 18:29:28 2001 George Lebl Patch to fix few 64bit issues * gal/e-table/e-table-header-item.c (ethi_draw) (ethi_start_drag) gal/widgets/e-categories.c (e_categories_value_at) (e_categories_value_to_string): Use GINT_TO_POINTER and GPOINTER_TO_INT to cast between pointers and ints to fix 64bit issues connected with that. * gal/e-table/e-table-sorting-utils.c (e_table_sorting_utils_tree_check_position) gal/util/e-sorter-array.c (e_sorter_array_append): Use size_t for size not ints to fix crashes * gal/e-text/e-completion-match.c, gal/e-text/e-completion.c: Include svn path=/trunk/; revision=12507 --- widgets/table/e-table-header-item.c | 36 +++++++++++++++++------------------ widgets/table/e-table-sorting-utils.c | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'widgets/table') diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index e089cb5fa6..8326087f9d 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -795,19 +795,19 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width for (i = 0; i < length; i++) { ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i); g_hash_table_insert (arrows, - (gpointer) column.column, - (gpointer) (column.ascending ? - E_TABLE_COL_ARROW_UP : - E_TABLE_COL_ARROW_DOWN)); + GINT_TO_POINTER (column.column), + GINT_TO_POINTER (column.ascending ? + E_TABLE_COL_ARROW_UP : + E_TABLE_COL_ARROW_DOWN)); } length = e_table_sort_info_sorting_get_count(ethi->sort_info); for (i = 0; i < length; i++) { ETableSortColumn column = e_table_sort_info_sorting_get_nth(ethi->sort_info, i); g_hash_table_insert (arrows, - (gpointer) column.column, - (gpointer) (column.ascending ? - E_TABLE_COL_ARROW_UP : - E_TABLE_COL_ARROW_DOWN)); + GINT_TO_POINTER (column.column), + GINT_TO_POINTER (column.ascending ? + E_TABLE_COL_ARROW_UP : + E_TABLE_COL_ARROW_DOWN)); } } @@ -839,7 +839,7 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width width, height, x2 - x1, ethi->height, (ETableColArrow) g_hash_table_lookup ( - arrows, (gpointer) ecol->col_idx)); + arrows, GINT_TO_POINTER (ecol->col_idx))); } g_hash_table_destroy (arrows); @@ -991,10 +991,10 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) group_indent ++; g_hash_table_insert ( arrows, - (gpointer) column.column, - (gpointer) (column.ascending ? - E_TABLE_COL_ARROW_UP : - E_TABLE_COL_ARROW_DOWN)); + GINT_TO_POINTER (column.column), + GINT_TO_POINTER (column.ascending ? + E_TABLE_COL_ARROW_UP : + E_TABLE_COL_ARROW_DOWN)); } length = e_table_sort_info_sorting_get_count(ethi->sort_info); for (i = 0; i < length; i++) { @@ -1004,10 +1004,10 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) g_hash_table_insert ( arrows, - (gpointer) column.column, - (gpointer) (column.ascending ? - E_TABLE_COL_ARROW_UP : - E_TABLE_COL_ARROW_DOWN)); + GINT_TO_POINTER (column.column), + GINT_TO_POINTER (column.ascending ? + E_TABLE_COL_ARROW_UP : + E_TABLE_COL_ARROW_DOWN)); } } @@ -1031,7 +1031,7 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) col_width, ethi->height, col_width, ethi->height, (ETableColArrow) g_hash_table_lookup ( - arrows, (gpointer) ecol->col_idx)); + arrows, GINT_TO_POINTER (ecol->col_idx))); gtk_drag_set_icon_pixmap ( context, gdk_window_get_colormap (widget->window), diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c index 4b2d581206..212a14a69d 100644 --- a/widgets/table/e-table-sorting-utils.c +++ b/widgets/table/e-table-sorting-utils.c @@ -315,8 +315,8 @@ e_table_sorting_utils_tree_check_position (ETreeModel *source, ETableSortInfo *s int e_table_sorting_utils_tree_insert(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, int count, ETreePath path) { - int start; - int end; + size_t start; + size_t end; ETreeSortClosure closure; closure.tree = source; -- cgit v1.2.3