diff options
| -rw-r--r-- | e-util/e-sorter-array.c | 2 | ||||
| -rw-r--r-- | widgets/table/e-table-header-item.c | 36 | ||||
| -rw-r--r-- | widgets/table/e-table-sorting-utils.c | 4 | ||||
| -rw-r--r-- | widgets/text/e-completion-match.c | 1 | ||||
| -rw-r--r-- | widgets/text/e-completion.c | 1 |
5 files changed, 23 insertions, 21 deletions
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index 44cf7b0f67..ecbdb23198 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -195,7 +195,7 @@ e_sorter_array_append (ESorterArray *esa, int count) esa->sorted = g_renew(int, esa->sorted, esa->rows + count); for (i = 0; i < count; i++) { int value = esa->rows; - int pos; + size_t pos; e_bsearch (&value, esa->sorted, esa->rows, sizeof (int), esort_callback, esa, &pos, NULL); memmove (esa->sorted + pos + 1, esa->sorted + pos, sizeof (int) * (esa->rows - pos)); esa->sorted[pos] = value; 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; diff --git a/widgets/text/e-completion-match.c b/widgets/text/e-completion-match.c index c14c8fe40a..19a0980516 100644 --- a/widgets/text/e-completion-match.c +++ b/widgets/text/e-completion-match.c @@ -26,6 +26,7 @@ */ #include <config.h> +#include <string.h> #include <gal/unicode/gunicode.h> #include <gal/widgets/e-unicode.h> #include "e-completion-match.h" diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c index 8c9adb4eba..0d72e4690b 100644 --- a/widgets/text/e-completion.c +++ b/widgets/text/e-completion.c @@ -27,6 +27,7 @@ #include <config.h> +#include <string.h> #include <stdio.h> #include <gtk/gtk.h> #include "e-completion.h" |