]> git.0d.be Git - empathy.git/commitdiff
empathy_window_present: use gdk_x11_display_get_user_time as timestamp
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 11 Mar 2010 13:32:57 +0000 (14:32 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 15 Mar 2010 15:28:21 +0000 (16:28 +0100)
Using G_MAXINT32 is wrong because X clock wraps every few weeks so G_MAXINT32
is not garanteed to be in the past or future.
Using gdk_x11_display_get_user_time should give us a good approximation of the
actual time.

Fixes bug #609001.

libempathy-gtk/empathy-ui-utils.c

index b91bf0313f8bc92002361f88198a4c669913bb3b..b8980a096a347e087add56bf0274155fc1dd402b 100644 (file)
@@ -1388,6 +1388,7 @@ void
 empathy_window_present (GtkWindow *window)
 {
        GdkWindow *gdk_window;
+       guint32 timestamp;
 
        g_return_if_fail (GTK_IS_WINDOW (window));
 
@@ -1409,7 +1410,8 @@ empathy_window_present (GtkWindow *window)
                        gtk_widget_hide (GTK_WIDGET (window));
        }
 
-       gtk_window_present_with_time (window, G_MAXINT32);
+       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);
 }