/pidgin/main: cc31dd2ff6cb: Remove a few unnecessary GLIB_CHECK_...

[Mark Doliner]

Changeset: cc31dd2ff6cb48ce8c2383269bcad130adfdff25
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2013-01-09 23:29 -0800
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/cc31dd2ff6cb

Description:

Remove a few unnecessary GLIB_CHECK_VERSION

diffstat:

 libpurple/example/nullclient.c    |   4 ----
 libpurple/protocols/msn/user.c    |  10 ----------
 libpurple/tests/check_libpurple.c |   4 ----
 pidgin/gtkeventloop.c             |   4 ----
 4 files changed, 0 insertions(+), 22 deletions(-)

diffs (66 lines):

diff --git a/libpurple/example/nullclient.c b/libpurple/example/nullclient.c
--- a/libpurple/example/nullclient.c
+++ b/libpurple/example/nullclient.c
@@ -103,11 +103,7 @@ static PurpleEventLoopUiOps glib_eventlo
 	glib_input_add,
 	g_source_remove,
 	NULL,
-#if GLIB_CHECK_VERSION(2,14,0)
 	g_timeout_add_seconds,
-#else
-	NULL,
-#endif
 
 	/* padding */
 	NULL,
diff --git a/libpurple/protocols/msn/user.c b/libpurple/protocols/msn/user.c
--- a/libpurple/protocols/msn/user.c
+++ b/libpurple/protocols/msn/user.c
@@ -761,17 +761,7 @@ msn_user_passport_cmp(MsnUser *user, con
 	str = purple_normalize_nocase(NULL, msn_user_get_passport(user));
 	pass = g_strdup(str);
 
-#if GLIB_CHECK_VERSION(2,16,0)
 	result = g_strcmp0(pass, purple_normalize_nocase(NULL, passport));
-#else
-	str = purple_normalize_nocase(NULL, passport);
-	if (!pass)
-		result = -(pass != str);
-	else if (!str)
-		result = pass != str;
-	else
-		result = strcmp(pass, str);
-#endif /* GLIB < 2.16.0 */
 
 	g_free(pass);
 
diff --git a/libpurple/tests/check_libpurple.c b/libpurple/tests/check_libpurple.c
--- a/libpurple/tests/check_libpurple.c
+++ b/libpurple/tests/check_libpurple.c
@@ -25,11 +25,7 @@ static PurpleEventLoopUiOps eventloop_ui
 	purple_check_input_add,
 	g_source_remove,
 	NULL, /* input_get_error */
-#if GLIB_CHECK_VERSION(2,14,0)
 	g_timeout_add_seconds,
-#else
-	NULL,
-#endif
 	NULL,
 	NULL,
 	NULL
diff --git a/pidgin/gtkeventloop.c b/pidgin/gtkeventloop.c
--- a/pidgin/gtkeventloop.c
+++ b/pidgin/gtkeventloop.c
@@ -124,11 +124,7 @@ static PurpleEventLoopUiOps eventloop_op
 	pidgin_input_add,
 	g_source_remove,
 	NULL, /* input_get_error */
-#if GLIB_CHECK_VERSION(2,14,0)
 	g_timeout_add_seconds,
-#else
-	NULL,
-#endif
 	NULL,
 	NULL,
 	NULL