Add a timestamp argument to menu functions and use it in
2004-06-21 Anders Carlsson <andersca@gnome.org> * src/common.h: * src/menu.c: (menu_closed), (activate_cb): * src/window.c: (menu_callback): Add a timestamp argument to menu functions and use it in meta_window_delete.
This commit is contained in:
parent
adb26d0543
commit
ef1ecc8128
@ -1,3 +1,11 @@
|
||||
2004-06-21 Anders Carlsson <andersca@gnome.org>
|
||||
|
||||
* src/common.h:
|
||||
* src/menu.c: (menu_closed), (activate_cb):
|
||||
* src/window.c: (menu_callback):
|
||||
Add a timestamp argument to menu functions and
|
||||
use it in meta_window_delete.
|
||||
|
||||
2004-06-21 Anders Carlsson <andersca@gnome.org>
|
||||
|
||||
* src/window.c: (meta_window_client_message):
|
||||
|
@ -72,6 +72,7 @@ typedef struct _MetaWindowMenu MetaWindowMenu;
|
||||
typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu,
|
||||
Display *xdisplay,
|
||||
Window client_xwindow,
|
||||
Time timestamp,
|
||||
MetaMenuOp op,
|
||||
int workspace,
|
||||
gpointer data);
|
||||
|
@ -104,6 +104,7 @@ menu_closed (GtkMenu *widget,
|
||||
meta_frames_notify_menu_hide (menu->frames);
|
||||
(* menu->func) (menu, gdk_display,
|
||||
menu->client_xwindow,
|
||||
gtk_get_current_event_time (),
|
||||
0, 0,
|
||||
menu->data);
|
||||
|
||||
@ -122,6 +123,7 @@ activate_cb (GtkWidget *menuitem, gpointer data)
|
||||
meta_frames_notify_menu_hide (md->menu->frames);
|
||||
(* md->menu->func) (md->menu, gdk_display,
|
||||
md->menu->client_xwindow,
|
||||
gtk_get_current_event_time (),
|
||||
md->op,
|
||||
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem),
|
||||
"workspace")),
|
||||
|
@ -5613,6 +5613,7 @@ static void
|
||||
menu_callback (MetaWindowMenu *menu,
|
||||
Display *xdisplay,
|
||||
Window client_xwindow,
|
||||
Time timestamp,
|
||||
MetaMenuOp op,
|
||||
int workspace_index,
|
||||
gpointer data)
|
||||
@ -5633,7 +5634,7 @@ menu_callback (MetaWindowMenu *menu,
|
||||
switch (op)
|
||||
{
|
||||
case META_MENU_OP_DELETE:
|
||||
meta_window_delete (window, meta_display_get_current_time (window->display));
|
||||
meta_window_delete (window, timestamp);
|
||||
break;
|
||||
|
||||
case META_MENU_OP_MINIMIZE:
|
||||
|
Loading…
Reference in New Issue
Block a user