brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tray: Fix handling of SYSTEM_TRAY_CANCEL_MESSAGE

Browse Source 
We were not looking at the right field for the message ID: the ID is in
the 4th field for BEGIN_MESSAGE, but 2nd field for CANCEL_MESSAGE.
This commit is contained in:
Vincent Untz 2011-02-01 12:13:47 +01:00
parent ed0fa7e1b7
commit 8abbd5dacb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tray/na-tray-manager.c
View File

@ -374,13 +374,17 @@ na_tray_manager_handle_begin_message (NaTrayManager *manager,
if (!socket) if (!socket)
return; return;
timeout = xevent->data.l[2];
len = xevent->data.l[3];
id = xevent->data.l[4];
/* Check if the same message is already in the queue and remove it if so */ /* Check if the same message is already in the queue and remove it if so */
for (p = manager->messages; p; p = p->next) for (p = manager->messages; p; p = p->next)
{ {
PendingMessage *pmsg = p->data; PendingMessage *pmsg = p->data;
if (xevent->window == pmsg->window && if (xevent->window == pmsg->window &&
xevent->data.l[4] == pmsg->id) id == pmsg->id)
{ {
/* Hmm, we found it, now remove it */ /* Hmm, we found it, now remove it */
pending_message_free (pmsg); pending_message_free (pmsg);
@ -390,10 +394,6 @@ na_tray_manager_handle_begin_message (NaTrayManager *manager,
} }
} }
timeout = xevent->data.l[2];
len = xevent->data.l[3];
id = xevent->data.l[4];
if (len == 0) if (len == 0)
{ {
g_signal_emit (manager, manager_signals[MESSAGE_SENT], 0, g_signal_emit (manager, manager_signals[MESSAGE_SENT], 0,
@ -420,6 +420,9 @@ na_tray_manager_handle_cancel_message (NaTrayManager *manager,
{ {
GList *p; GList *p;
GtkSocket *socket; GtkSocket *socket;
long id;
id = xevent->data.l[2];
/* Check if the message is in the queue and remove it if so */ /* Check if the message is in the queue and remove it if so */
for (p = manager->messages; p; p = p->next) for (p = manager->messages; p; p = p->next)
@ -427,7 +430,7 @@ na_tray_manager_handle_cancel_message (NaTrayManager *manager,
PendingMessage *msg = p->data; PendingMessage *msg = p->data;
if (xevent->window == msg->window && if (xevent->window == msg->window &&
xevent->data.l[4] == msg->id) id == msg->id)
{ {
pending_message_free (msg); pending_message_free (msg);
manager->messages = g_list_remove_link (manager->messages, p); manager->messages = g_list_remove_link (manager->messages, p);