[gtk/glib-build-fix] x11: Stop using GTimeVal
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/glib-build-fix] x11: Stop using GTimeVal
- Date: Fri, 31 Jul 2020 14:55:18 +0000 (UTC)
commit 5b3449cb4673333db822f8b0721750ea3a504107
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jul 31 10:54:41 2020 -0400
x11: Stop using GTimeVal
It has been deprecated, and that is breaking our
ci builds with -Werror.
gdk/x11/gdkapplaunchcontext-x11.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index b0a8985640..73b80331bb 100644
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -127,13 +127,13 @@ end_startup_notification (GdkDisplay *display,
* the sequence (don’t use an SnMonitorContext)
*/
#define STARTUP_TIMEOUT_LENGTH_SECONDS 30
-#define STARTUP_TIMEOUT_LENGTH (STARTUP_TIMEOUT_LENGTH_SECONDS * 1000)
+#define STARTUP_TIMEOUT_LENGTH (STARTUP_TIMEOUT_LENGTH_SECONDS * 1000) /* ms */
typedef struct
{
GdkDisplay *display;
char *startup_id;
- GTimeVal time;
+ guint64 time;
} StartupNotificationData;
static void
@@ -175,14 +175,14 @@ startup_timeout (void *data)
{
StartupTimeoutData *std;
GSList *tmp;
- GTimeVal now;
+ guint64 now;
int min_timeout;
std = data;
min_timeout = STARTUP_TIMEOUT_LENGTH;
- g_get_current_time (&now);
+ now = g_get_monotonic_time ();
tmp = std->contexts;
while (tmp != NULL)
@@ -194,9 +194,7 @@ startup_timeout (void *data)
sn_data = tmp->data;
next = tmp->next;
- elapsed =
- ((((double) now.tv_sec - sn_data->time.tv_sec) * G_USEC_PER_SEC +
- (now.tv_usec - sn_data->time.tv_usec))) / 1000.0;
+ elapsed = (now - sn_data->time) / 1000.0;
if (elapsed >= STARTUP_TIMEOUT_LENGTH)
{
@@ -246,7 +244,7 @@ add_startup_timeout (GdkX11Screen *screen,
sn_data = g_new (StartupNotificationData, 1);
sn_data->display = g_object_ref (GDK_SCREEN_DISPLAY (screen));
sn_data->startup_id = g_strdup (startup_id);
- g_get_current_time (&sn_data->time);
+ sn_data->time = g_get_monotonic_time ();
data->contexts = g_slist_prepend (data->contexts, sn_data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]