aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-ui-utils.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-04-25 01:06:48 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-04-25 02:44:09 +0800
commit9e34e6de9a81e02929cfc65d771a4da6eb348df6 (patch)
tree39d677f674069843d6acbec25e754620f4947b3d /libempathy-gtk/empathy-ui-utils.c
parent76332f0f9be6ffe77f7b756d00384e1c46c6cf9e (diff)
downloadgsoc2013-empathy-9e34e6de9a81e02929cfc65d771a4da6eb348df6.tar
gsoc2013-empathy-9e34e6de9a81e02929cfc65d771a4da6eb348df6.tar.gz
gsoc2013-empathy-9e34e6de9a81e02929cfc65d771a4da6eb348df6.tar.bz2
gsoc2013-empathy-9e34e6de9a81e02929cfc65d771a4da6eb348df6.tar.lz
gsoc2013-empathy-9e34e6de9a81e02929cfc65d771a4da6eb348df6.tar.xz
gsoc2013-empathy-9e34e6de9a81e02929cfc65d771a4da6eb348df6.tar.zst
gsoc2013-empathy-9e34e6de9a81e02929cfc65d771a4da6eb348df6.zip
No longer need to dig out the X time ourselves
Diffstat (limited to 'libempathy-gtk/empathy-ui-utils.c')
-rw-r--r--libempathy-gtk/empathy-ui-utils.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 70098ad3e..2f06ae902 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1417,20 +1417,6 @@ empathy_window_present_with_time (GtkWindow *window,
gtk_widget_hide (GTK_WIDGET (window));
}
- timestamp = gtk_get_current_event_time ();
- if (timestamp == 0 && gdk_window != NULL) {
- GdkEventMask mask;
-
- /* According to the documentation of gdk_x11_get_server_time
- * GDK_PROPERTY_CHANGE_MASK needs to be set in its events otherwise a hang
- * can occur. Be sure to at least temporarily set this mask */
- mask = gdk_window_get_events (gdk_window);
- gdk_window_set_events (gdk_window,
- mask | GDK_PROPERTY_CHANGE_MASK);
- timestamp = gdk_x11_get_server_time (gdk_window);
- gdk_window_set_events (gdk_window, mask);
- }
-
gtk_window_present_with_time (window, timestamp);
gtk_window_set_skip_taskbar_hint (window, FALSE);
gtk_window_deiconify (window);