X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2Fempathy-ui-utils.c;h=4503a39cc22f67f12cb613e3d1be4f55df183d46;hp=b8980a096a347e087add56bf0274155fc1dd402b;hb=4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e;hpb=f22c92022672a78bead49aa44947bc9380ebf2b8

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index b8980a09..4503a39c 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1410,7 +1410,11 @@ empathy_window_present (GtkWindow *window)
 			gtk_widget_hide (GTK_WIDGET (window));
 	}
 
-	timestamp = gdk_x11_display_get_user_time (gdk_display_get_default ());
+	timestamp = gtk_get_current_event_time ();
+	if (timestamp == 0)
+		/* No event, fallback to _NET_WM_USER_TIME */
+		timestamp = gdk_x11_display_get_user_time (gdk_display_get_default ());
+
 	gtk_window_present_with_time (window, timestamp);
 	gtk_window_set_skip_taskbar_hint (window, FALSE);
 	gtk_window_deiconify (window);