From c1b0b713ca6f6d18b9c4fef9e2dd2e36a40c9905 Mon Sep 17 00:00:00 2001 From: Harish Krishnaswamy Date: Fri, 9 Dec 2005 11:01:23 +0000 Subject: prefix the wrapper functions with e - do not use g lest it is assumed to 2005-12-09 Harish Krishnaswamy * e-util.[ch] (e_str_compare), (e_str_case_compare), (e_collate_compare), (e_int_compare): prefix the wrapper functions with e - do not use g lest it is assumed to be a glib function. * e-table-example-2.c (create_table), e-table-extras.c (ete_init): * e-table-size-test.c (create_table), test-check.c (check_test): * test-cols.c (multi_cols_test), test-table.c (table_browser_test): s/g_*_compare/e_*_compare. svn path=/trunk/; revision=30739 --- e-util/ChangeLog | 7 +++++++ e-util/e-util.c | 8 ++++---- e-util/e-util.h | 8 ++++---- widgets/table/ChangeLog | 10 ++++++++++ widgets/table/e-table-example-2.c | 2 +- widgets/table/e-table-extras.c | 8 ++++---- widgets/table/e-table-size-test.c | 2 +- widgets/table/test-check.c | 2 +- widgets/table/test-cols.c | 2 +- widgets/table/test-table.c | 2 +- 10 files changed, 34 insertions(+), 17 deletions(-) diff --git a/e-util/ChangeLog b/e-util/ChangeLog index fe3b5357a0..ae2a0a7a44 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2005-12-09 Harish Krishnaswamy + + * e-util.[ch] (e_str_compare), (e_str_case_compare), + (e_collate_compare), (e_int_compare): prefix the wrapper + functions with e - do not use g lest it is assumed to + be a glib function. + 2005-11-26 Tor Lillqvist * e-dialog-utils.c diff --git a/e-util/e-util.c b/e-util/e-util.c index f1444a2a64..5b7875293d 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -49,7 +49,7 @@ #include "e-util-private.h" int -g_str_compare (const void *x, const void *y) +e_str_compare (const void *x, const void *y) { if (x == NULL || y == NULL) { if (x == y) @@ -62,7 +62,7 @@ g_str_compare (const void *x, const void *y) } int -g_str_case_compare (const void *x, const void *y) +e_str_case_compare (const void *x, const void *y) { if (x == NULL || y == NULL) { if (x == y) @@ -75,7 +75,7 @@ g_str_case_compare (const void *x, const void *y) } int -g_collate_compare (const void *x, const void *y) +e_collate_compare (const void *x, const void *y) { if (x == NULL || y == NULL) { if (x == y) @@ -88,7 +88,7 @@ g_collate_compare (const void *x, const void *y) } int -g_int_compare (const void *x, const void *y) +e_int_compare (const void *x, const void *y) { if (GPOINTER_TO_INT (x) < GPOINTER_TO_INT (y)) return -1; diff --git a/e-util/e-util.h b/e-util/e-util.h index d665a67052..cc0043c7df 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -137,13 +137,13 @@ typedef enum { E_FOCUS_START, E_FOCUS_END } EFocus; -int g_str_compare (const void *x, +int e_str_compare (const void *x, const void *y); -int g_str_case_compare (const void *x, +int e_str_case_compare (const void *x, const void *y); -int g_collate_compare (const void *x, +int e_collate_compare (const void *x, const void *y); -int g_int_compare (const void *x, +int e_int_compare (const void *x, const void *y); char *e_strdup_strip (const char *string); void e_free_object_list (GList *list); diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index cdc3165262..b263df9c61 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,3 +1,13 @@ +2005-12-09 Harish Krishnaswamy + + * e-table-example-2.c (create_table): + * e-table-extras.c (ete_init): + * e-table-size-test.c (create_table): + * test-check.c (check_test): + * test-cols.c (multi_cols_test): + * test-table.c (table_browser_test): + s/g_*_compare/e_*_compare. + 2005-12-07 Boby Wang Fixes #322740. diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index e00265650f..e428f6e54e 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -296,7 +296,7 @@ create_table () ETableCol *ecol = e_table_col_new ( i, headers [i], 1.0, 20, cell_left_just, - g_str_compare, TRUE); + e_str_compare, TRUE); /* Add it to the header. */ e_table_header_add_column (e_table_header, ecol, i); } diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index 8bb4c23ae6..74bdc26233 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -167,10 +167,10 @@ ete_init (ETableExtras *extras) extras->searches = g_hash_table_new(g_str_hash, g_str_equal); extras->pixbufs = g_hash_table_new(g_str_hash, g_str_equal); - e_table_extras_add_compare(extras, "string", g_str_compare); - e_table_extras_add_compare(extras, "stringcase", g_str_case_compare); - e_table_extras_add_compare(extras, "collate", g_collate_compare); - e_table_extras_add_compare(extras, "integer", g_int_compare); + e_table_extras_add_compare(extras, "string", e_str_compare); + e_table_extras_add_compare(extras, "stringcase", e_str_case_compare); + e_table_extras_add_compare(extras, "collate", e_collate_compare); + e_table_extras_add_compare(extras, "integer", e_int_compare); e_table_extras_add_compare(extras, "string-integer", e_strint_compare); e_table_extras_add_search(extras, "string", e_string_search); diff --git a/widgets/table/e-table-size-test.c b/widgets/table/e-table-size-test.c index 05a4245899..07810d4893 100644 --- a/widgets/table/e-table-size-test.c +++ b/widgets/table/e-table-size-test.c @@ -254,7 +254,7 @@ create_table (void) ETableCol *ecol = e_table_col_new ( i, headers [i], 1.0, 20, cell_left_just, - g_str_compare, TRUE); + e_str_compare, TRUE); /* Add it to the header. */ e_table_header_add_column (e_table_header, ecol, i); } diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c index 8bba3af5a7..5de9e77a6c 100644 --- a/widgets/table/test-check.c +++ b/widgets/table/test-check.c @@ -187,7 +187,7 @@ check_test (void) gdk_pixbuf_unref (pixbuf); e_table_header_add_column (e_table_header, col_0, 0); - col_1 = e_table_col_new (1, "Item Name", 1.0, 20, cell_left_just, g_str_compare, TRUE); + col_1 = e_table_col_new (1, "Item Name", 1.0, 20, cell_left_just, e_str_compare, TRUE); e_table_header_add_column (e_table_header, col_1, 1); e_table_col_set_arrow (col_1, E_TABLE_COL_ARROW_DOWN); diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c index fa110f204c..e64ba3826f 100644 --- a/widgets/table/test-cols.c +++ b/widgets/table/test-cols.c @@ -196,7 +196,7 @@ multi_cols_test (void) g_free (images); } - col_1 = e_table_col_new (1, "Item Name", 1.0, 20, cell_left_just, g_str_compare, TRUE); + col_1 = e_table_col_new (1, "Item Name", 1.0, 20, cell_left_just, e_str_compare, TRUE); e_table_header_add_column (e_table_header, col_1, 0); col_0 = e_table_col_new (0, "A", 0.0, 48, cell_image_toggle, g_int_compare, TRUE); diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c index 7a5eb82da6..a33ecc3c15 100644 --- a/widgets/table/test-table.c +++ b/widgets/table/test-table.c @@ -293,7 +293,7 @@ table_browser_test (void) ETableCol *ecol = e_table_col_new ( i, column_labels [i], 1.0, 20, cell_left_just, - g_str_compare, TRUE, + e_str_compare, TRUE, priority); e_table_header_add_column (e_table_header, ecol, i); -- cgit v1.2.3