AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-12 20:00:09 +00:00
Code Issues Projects Releases Wiki Activity

Use gdk_display_sync instead of XSync

Browse Source
This commit is contained in:
Matthias Clasen 2009-07-06 02:03:21 -04:00
parent 42e7318b62
commit dab552dc22
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtktrayicon-x11.c
View File

@ -441,7 +441,7 @@ gtk_tray_icon_send_manager_message (GtkTrayIcon *icon,
gdk_error_trap_push (); gdk_error_trap_push ();
XSendEvent (display, XSendEvent (display,
icon->priv->manager_window, False, NoEventMask, (XEvent *)&ev); icon->priv->manager_window, False, NoEventMask, (XEvent *)&ev);
XSync (display, False); gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (icon)));
gdk_error_trap_pop (); gdk_error_trap_pop ();
} }
@ -646,11 +646,12 @@ _gtk_tray_icon_send_message (GtkTrayIcon *icon,
gint len) gint len)
{ {
guint stamp; guint stamp;
Display *xdisplay;
g_return_val_if_fail (GTK_IS_TRAY_ICON (icon), 0); g_return_val_if_fail (GTK_IS_TRAY_ICON (icon), 0);
g_return_val_if_fail (timeout >= 0, 0); g_return_val_if_fail (timeout >= 0, 0);
g_return_val_if_fail (message != NULL, 0); g_return_val_if_fail (message != NULL, 0);
if (icon->priv->manager_window == None) if (icon->priv->manager_window == None)
return 0; return 0;
@ -665,14 +666,12 @@ _gtk_tray_icon_send_message (GtkTrayIcon *icon,
timeout, len, stamp); timeout, len, stamp);
/* Now to send the actual message */ /* Now to send the actual message */
xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
gdk_error_trap_push (); gdk_error_trap_push ();
while (len > 0) while (len > 0)
{ {
XClientMessageEvent ev; XClientMessageEvent ev;
Display *xdisplay;
xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
memset (&ev, 0, sizeof (ev)); memset (&ev, 0, sizeof (ev));
ev.type = ClientMessage; ev.type = ClientMessage;
ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon)); ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
@ -692,11 +691,10 @@ _gtk_tray_icon_send_message (GtkTrayIcon *icon,
} }
XSendEvent (xdisplay, XSendEvent (xdisplay,
icon->priv->manager_window, False, icon->priv->manager_window, False,
StructureNotifyMask, (XEvent *)&ev); StructureNotifyMask, (XEvent *)&ev);
XSync (xdisplay, False);
} }
gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (icon)));
gdk_error_trap_pop (); gdk_error_trap_pop ();
return stamp; return stamp;