Commit 230581b5 authored by Cosimo Cecchi's avatar Cosimo Cecchi

[eel] cleanup eel-glib-extensions

parent fbccd9bf
......@@ -701,69 +701,6 @@ eel_round (double d)
return val;
}
GList *
eel_g_list_from_g_slist (GSList *slist)
{
GList *list;
GSList *node;
list = NULL;
for (node = slist; node != NULL; node = node->next) {
list = g_list_prepend (list, node->data);
}
return g_list_reverse (list);
}
GSList *
eel_g_slist_from_g_list (GList *list)
{
GSList *slist;
GList *node;
slist = NULL;
for (node = list; node != NULL; node = node->next) {
slist = g_slist_prepend (slist, node->data);
}
return g_slist_reverse (slist);
}
/* Return the operating system name: Linux, Solaris, etc. */
char *
eel_get_operating_system_name (void)
{
struct utsname buffer;
if (uname (&buffer) != -1) {
/* Check for special sysnames for which there is
* more accepted names.
*/
if (eel_str_is_equal (buffer.sysname, "SunOS")) {
return g_strdup ("Solaris");
}
return g_strdup (buffer.sysname);
}
return g_strdup ("Unix");
}
int
eel_compare_integer (gconstpointer a,
gconstpointer b)
{
int int_a;
int int_b;
int_a = GPOINTER_TO_INT (a);
int_b = GPOINTER_TO_INT (b);
if (int_a == int_b) {
return 0;
}
return int_a < int_b ? -1 : 1;
}
/**
* eel_g_object_list_ref
*
......@@ -1284,27 +1221,6 @@ eel_self_check_glib_extensions (void)
setlocale (LC_TIME, "");
g_free (huge_string);
/* eel_shell_quote */
EEL_CHECK_STRING_RESULT (g_shell_quote (""), "''");
EEL_CHECK_STRING_RESULT (g_shell_quote ("a"), "'a'");
EEL_CHECK_STRING_RESULT (g_shell_quote ("("), "'('");
EEL_CHECK_STRING_RESULT (g_shell_quote ("'"), "''\\'''");
EEL_CHECK_STRING_RESULT (g_shell_quote ("'a"), "''\\''a'");
EEL_CHECK_STRING_RESULT (g_shell_quote ("a'"), "'a'\\'''");
EEL_CHECK_STRING_RESULT (g_shell_quote ("a'a"), "'a'\\''a'");
/* eel_compare_integer */
EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (0)), 0);
EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (1)), -1);
EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (1), GINT_TO_POINTER (0)), 1);
EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (-1), GINT_TO_POINTER (0)), -1);
EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (-1)), 1);
EEL_CHECK_INTEGER_RESULT (eel_compare_integer (GINT_TO_POINTER (-1), GINT_TO_POINTER (-1)), 0);
#ifdef __linux__
EEL_CHECK_STRING_RESULT (eel_get_operating_system_name (), "Linux");
#endif
}
#endif /* !EEL_OMIT_SELF_CHECK */
......@@ -33,13 +33,6 @@
/* A gboolean variant for bit fields. */
typedef guint eel_boolean_bit;
/* Callback functions that have user data. */
typedef int (* EelCompareFunction) (gconstpointer a,
gconstpointer b,
gpointer callback_data);
typedef int (* EelSearchFunction) (gconstpointer item,
gpointer callback_data);
/* Predicate. */
typedef gboolean (* EelPredicateFunction) (gpointer data,
gpointer callback_data);
......@@ -67,10 +60,6 @@ void eel_g_list_free_deep_custom (GList *
GFunc element_free_func,
gpointer user_data);
/* GSList functions. */
GList * eel_g_list_from_g_slist (GSList *list);
GSList * eel_g_slist_from_g_list (GList *list);
/* List functions for slists of g_free'able objects. */
void eel_g_slist_free_deep (GSList *list);
void eel_g_slist_free_deep_custom (GSList *list,
......@@ -111,13 +100,6 @@ gint64 eel_get_system_time (void);
/* math */
int eel_round (double d);
/* A GCompareFunc for integers */
int eel_compare_integer (gconstpointer a,
gconstpointer b);
/* Return the operating system name: Linux, Solaris, etc. */
char * eel_get_operating_system_name (void);
/* Better weak pointer functions */
void eel_add_weak_pointer (gpointer pointer_location);
void eel_remove_weak_pointer (gpointer pointer_location);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment