aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitlbee.h5
-rw-r--r--lib/xmltree.c3
-rw-r--r--protocols/oscar/oscar.c3
3 files changed, 9 insertions, 2 deletions
diff --git a/bitlbee.h b/bitlbee.h
index 6c3a437f..13f3fda5 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -106,6 +106,11 @@ extern "C" {
#undef g_main_quit
#define g_main_quit __PLEASE_USE_B_MAIN_QUIT__
+/* And now, because GLib folks think everyone loves typing ridiculously long
+ function names ... no I don't or I'd write BitlBee in Java, ffs. */
+#define g_strcasecmp g_ascii_strcasecmp
+#define g_strncasecmp g_ascii_strncasecmp
+
#ifndef G_GNUC_MALLOC
/* Doesn't exist in GLib <=2.4 while everything else in BitlBee should
work with it, so let's fake this one. */
diff --git a/lib/xmltree.c b/lib/xmltree.c
index e2654579..74292be9 100644
--- a/lib/xmltree.c
+++ b/lib/xmltree.c
@@ -29,6 +29,9 @@
#include "xmltree.h"
+#define g_strcasecmp g_ascii_strcasecmp
+#define g_strncasecmp g_ascii_strncasecmp
+
static void xt_start_element( GMarkupParseContext *ctx, const gchar *element_name, const gchar **attr_names, const gchar **attr_values, gpointer data, GError **error )
{
struct xt_parser *xt = data;
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index de4efb6a..1366fe41 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -252,8 +252,7 @@ static char *normalize(const char *s)
g_return_val_if_fail((s != NULL), NULL);
- u = t = g_strdup(s);
- g_strdown(t);
+ u = t = g_ascii_strdown(s, -1);
while (*t && (x < BUF_LEN - 1)) {
if (*t != ' ' && *t != '!') {