/pidgin/main: 03b1fd2e362b: Bumped the required GLib version to ...

Changeset: 03b1fd2e362b73f2cf1f19ea13a047b614bab7b7
Author:	 James Geboski <[email protected]>
Date:	 2015-12-15 19:37 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/03b1fd2e362b

Description:

Bumped the required GLib version to 2.28

diffstat:

 configure.ac           |   2 +-
 libpurple/glibcompat.h |  72 --------------------------------------------------
 2 files changed, 1 insertions(+), 73 deletions(-)

diffs (94 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -479,7 +479,7 @@ AM_CONDITIONAL(INSTALL_I18N, test "x$ena
 dnl #######################################################################
 dnl # Check for GLib 2.20 (required)
 dnl #######################################################################
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.20.0 gobject-2.0 gthread-2.0], , [
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28.0 gobject-2.0 gthread-2.0], , [
 	AC_MSG_RESULT(no)
 	AC_MSG_ERROR([
 
diff --git a/libpurple/glibcompat.h b/libpurple/glibcompat.h
--- a/libpurple/glibcompat.h
+++ b/libpurple/glibcompat.h
@@ -116,78 +116,6 @@ static inline gchar *g_utf8_substring(co
 	return out;
 }
 
-#if !GLIB_CHECK_VERSION(2, 28, 0)
-
-static inline gint64 g_get_monotonic_time(void)
-{
-	GTimeVal time_s;
-
-	g_get_current_time(&time_s);
-
-	return ((gint64)time_s.tv_sec << 32) | time_s.tv_usec;
-}
-
-static inline gint64 g_get_real_time(void)
-{
-	GTimeVal time_s;
-
-	g_get_current_time(&time_s);
-
-	return (((gint64)time_s.tv_sec) * 1000000) + time_s.tv_usec;
-}
-
-static inline void g_list_free_full(GList *list, GDestroyNotify free_func)
-{
-	g_list_foreach(list, (GFunc)free_func, NULL);
-	g_list_free(list);
-}
-
-static inline void g_slist_free_full(GSList *list, GDestroyNotify free_func)
-{
-	g_slist_foreach(list, (GFunc)free_func, NULL);
-	g_slist_free(list);
-}
-
-#if !GLIB_CHECK_VERSION(2, 26, 0)
-
-typedef struct stat GStatBuf;
-
-static inline void g_object_notify_by_pspec(GObject *object, GParamSpec *pspec)
-{
-	g_object_notify(object, g_param_spec_get_name(pspec));
-}
-
-static inline void g_object_class_install_properties(GObjectClass *oclass,
-	guint n_pspecs, GParamSpec **pspecs)
-{
-	guint i;
-	for (i = 1; i < n_pspecs; ++i)
-		g_object_class_install_property(oclass, i, pspecs[i]);
-}
-
-#if !GLIB_CHECK_VERSION(2, 22, 0)
-
-#include <stdarg.h>
-
-static inline GError * g_error_new_valist(GQuark domain, gint code,
-	const gchar *format, va_list args)
-{
-	gchar *str;
-	GError *error;
-
-	str = g_strdup_vprintf(format, args);
-	error = g_error_new_literal(domain, code, str);
-
-	g_free(str);
-	return error;
-}
-
-#endif /* < 2.22.0 */
-
-#endif /* < 2.26.0 */
-
-#endif /* < 2.28.0 */
-
 #endif /* < 2.30.0 */
 
 #endif /* < 2.32.0 */

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits