diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-20 19:36:03 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-27 21:32:06 +0800 |
| commit | 93e6230459c89c220dfe0d2ea4434fda3c85e4e2 (patch) | |
| tree | 695c32127114082fffd27c5a90624e2a6b7e6522 | |
| parent | 98f622ed45e569239ed32ba1aca7c9f3ca7732da (diff) | |
| download | gsoc2013-empathy-93e6230459c89c220dfe0d2ea4434fda3c85e4e2.tar gsoc2013-empathy-93e6230459c89c220dfe0d2ea4434fda3c85e4e2.tar.gz gsoc2013-empathy-93e6230459c89c220dfe0d2ea4434fda3c85e4e2.tar.bz2 gsoc2013-empathy-93e6230459c89c220dfe0d2ea4434fda3c85e4e2.tar.lz gsoc2013-empathy-93e6230459c89c220dfe0d2ea4434fda3c85e4e2.tar.xz gsoc2013-empathy-93e6230459c89c220dfe0d2ea4434fda3c85e4e2.tar.zst gsoc2013-empathy-93e6230459c89c220dfe0d2ea4434fda3c85e4e2.zip | |
don't use gtk_window_present_with_time if timestamp == GDK_CURRENT_TIME (#629922)
| -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 d07ea459d..4014f92b5 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -1606,7 +1606,11 @@ empathy_window_present_with_time (GtkWindow *window, gtk_widget_hide (GTK_WIDGET (window)); } - gtk_window_present_with_time (window, timestamp); + if (timestamp == GDK_CURRENT_TIME) + gtk_window_present (window); + else + gtk_window_present_with_time (window, timestamp); + gtk_window_set_skip_taskbar_hint (window, FALSE); gtk_window_deiconify (window); } |