diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-11 21:32:57 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-15 23:28:21 +0800 |
| commit | f22c92022672a78bead49aa44947bc9380ebf2b8 (patch) | |
| tree | 7c13bed95a42e7395dc8d5c6b9265cf3f697a452 /libempathy-gtk | |
| parent | c1d6af1cfbb1801d26a0a550dc7ae9a81e642bc0 (diff) | |
| download | gsoc2013-empathy-f22c92022672a78bead49aa44947bc9380ebf2b8.tar gsoc2013-empathy-f22c92022672a78bead49aa44947bc9380ebf2b8.tar.gz gsoc2013-empathy-f22c92022672a78bead49aa44947bc9380ebf2b8.tar.bz2 gsoc2013-empathy-f22c92022672a78bead49aa44947bc9380ebf2b8.tar.lz gsoc2013-empathy-f22c92022672a78bead49aa44947bc9380ebf2b8.tar.xz gsoc2013-empathy-f22c92022672a78bead49aa44947bc9380ebf2b8.tar.zst gsoc2013-empathy-f22c92022672a78bead49aa44947bc9380ebf2b8.zip | |
empathy_window_present: use gdk_x11_display_get_user_time as timestamp
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.
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index b91bf0313..b8980a096 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -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); } |