diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rwxr-xr-x | gtk/gtktrayicon-x11.c | 6 |
3 files changed, 11 insertions, 3 deletions
@@ -1,5 +1,9 @@ 2006-08-17 Matthias Clasen <mclasen@redhat.com> + * gtk/gtktrayicon-x11.c: Fix the ClientMessages we are + sending to the notification area to be more in sync with + the systray spec. (#350860, Wincent Untz) + * gtk/gtkprintoperation.c (print_pages, preview_ready): Queue printing idles at a low priority. (#348289, Yevgen Muntyan) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 71c5e5cbb7..dc2a411dca 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-08-17 Matthias Clasen <mclasen@redhat.com> + * gtk/gtktrayicon-x11.c: Fix the ClientMessages we are + sending to the notification area to be more in sync with + the systray spec. (#350860, Wincent Untz) + * gtk/gtkprintoperation.c (print_pages, preview_ready): Queue printing idles at a low priority. (#348289, Yevgen Muntyan) diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c index 1c44ca0cb3..e85ad9c085 100755 --- a/gtk/gtktrayicon-x11.c +++ b/gtk/gtktrayicon-x11.c @@ -439,7 +439,7 @@ _gtk_tray_icon_send_message (GtkTrayIcon *icon, /* Get ready to send the message */ gtk_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE, - icon->priv->manager_window, + (Window)gtk_plug_get_id (GTK_PLUG (icon)), timeout, len, stamp); /* Now to send the actual message */ @@ -452,7 +452,7 @@ _gtk_tray_icon_send_message (GtkTrayIcon *icon, xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); ev.type = ClientMessage; - ev.window = icon->priv->manager_window; + ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon)); ev.format = 8; ev.message_type = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_MESSAGE_DATA", False); @@ -487,7 +487,7 @@ _gtk_tray_icon_cancel_message (GtkTrayIcon *icon, g_return_if_fail (id > 0); gtk_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE, - icon->priv->manager_window, + (Window)gtk_plug_get_id (GTK_PLUG (icon)), id, 0, 0); } |