diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-11 21:52:59 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-15 23:28:21 +0800 |
| commit | 4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e (patch) | |
| tree | df91fe8a1ee42d2bb7b3689f47e1266b71b4ee09 /libempathy-gtk | |
| parent | f22c92022672a78bead49aa44947bc9380ebf2b8 (diff) | |
| download | gsoc2013-empathy-4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e.tar gsoc2013-empathy-4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e.tar.gz gsoc2013-empathy-4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e.tar.bz2 gsoc2013-empathy-4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e.tar.lz gsoc2013-empathy-4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e.tar.xz gsoc2013-empathy-4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e.tar.zst gsoc2013-empathy-4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e.zip | |
empathy_window_present: use _NET_WM_USER_TIME only has a fallback
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index b8980a096..4503a39cc 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); |