diff options
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/ChangeLog | 7 | ||||
| -rw-r--r-- | e-util/e-util.c | 8 | ||||
| -rw-r--r-- | e-util/e-util.h | 8 |
3 files changed, 15 insertions, 8 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 <kharish@novell.com> + + * 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 <tml@novell.com> * 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); |