From f03eca7b1dc56a14814839a3602e45a8435f824d Mon Sep 17 00:00:00 2001 From: "Fan, Chun-wei" Date: Mon, 15 Nov 2010 16:07:38 +0100 Subject: [PATCH] gtktoolitemgroup: Update to new Glib api MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also, bump required Glib version to 2.27.3 Fixes https://bugzilla.gnome.org/show_bug.cgi?id=634882 Signed-off-by: Javier Jardón --- configure.in | 2 +- gtk/gtktoolitemgroup.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index fdbb2ce048..9de24b7dbb 100644 --- a/configure.in +++ b/configure.in @@ -31,7 +31,7 @@ m4_define([gtk_api_version], [2.0]) m4_define([gtk_binary_version], [2.10.0]) # required versions of other packages -m4_define([glib_required_version], [2.25.10]) +m4_define([glib_required_version], [2.27.3]) m4_define([pango_required_version], [1.20]) m4_define([atk_required_version], [1.29.2]) m4_define([cairo_required_version], [1.6]) diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c index 833c99b6dd..8025a64c67 100644 --- a/gtk/gtktoolitemgroup.c +++ b/gtk/gtktoolitemgroup.c @@ -1754,10 +1754,8 @@ gtk_tool_item_group_set_header_relief (GtkToolItemGroup *group, static gint64 gtk_tool_item_group_get_animation_timestamp (GtkToolItemGroup *group) { - GTimeVal now; - - g_source_get_current_time (group->priv->animation_timeout, &now); - return (now.tv_sec * G_USEC_PER_SEC + now.tv_usec - group->priv->animation_start) / 1000; + return (g_source_get_time (group->priv->animation_timeout) - + group->priv->animation_start) / 1000; } static void