[gtk+] GtkToolitemGroup: Use monotonic clock for animation timeout
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkToolitemGroup: Use monotonic clock for animation timeout
- Date: Mon, 1 Nov 2010 15:45:06 +0000 (UTC)
commit 69c7213ba99e80715b630bbbdfb88330913c0871
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Nov 1 11:15:30 2010 -0400
GtkToolitemGroup: Use monotonic clock for animation timeout
gtk/gtktoolitemgroup.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c
index 9f238c6..a1f4b05 100644
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -1798,10 +1798,10 @@ gtk_tool_item_group_set_header_relief (GtkToolItemGroup *group,
static gint64
gtk_tool_item_group_get_animation_timestamp (GtkToolItemGroup *group)
{
- GTimeVal now;
+ GTimeSpec 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;
+ g_source_get_time (group->priv->animation_timeout, &now);
+ return (now.tv_sec * G_USEC_PER_SEC + now.tv_nsec / 1000 - group->priv->animation_start) / 1000;
}
static void
@@ -1924,14 +1924,14 @@ gtk_tool_item_group_set_collapsed (GtkToolItemGroup *group,
{
if (priv->animation)
{
- GTimeVal now;
+ GTimeSpec now;
- g_get_current_time (&now);
+ g_get_monotonic_time (&now);
if (priv->animation_timeout)
g_source_destroy (priv->animation_timeout);
- priv->animation_start = (now.tv_sec * G_USEC_PER_SEC + now.tv_usec);
+ priv->animation_start = (now.tv_sec * G_USEC_PER_SEC + now.tv_nsec / 1000);
priv->animation_timeout = g_timeout_source_new (ANIMATION_TIMEOUT);
g_source_set_callback (priv->animation_timeout,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]