Commit ef1ecc81 authored by Anders Carlsson's avatar Anders Carlsson Committed by Anders Carlsson

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.
parent adb26d05
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> 2004-06-21 Anders Carlsson <andersca@gnome.org>
* src/window.c: (meta_window_client_message): * src/window.c: (meta_window_client_message):
......
...@@ -72,6 +72,7 @@ typedef struct _MetaWindowMenu MetaWindowMenu; ...@@ -72,6 +72,7 @@ typedef struct _MetaWindowMenu MetaWindowMenu;
typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu, typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu,
Display *xdisplay, Display *xdisplay,
Window client_xwindow, Window client_xwindow,
Time timestamp,
MetaMenuOp op, MetaMenuOp op,
int workspace, int workspace,
gpointer data); gpointer data);
......
...@@ -104,6 +104,7 @@ menu_closed (GtkMenu *widget, ...@@ -104,6 +104,7 @@ menu_closed (GtkMenu *widget,
meta_frames_notify_menu_hide (menu->frames); meta_frames_notify_menu_hide (menu->frames);
(* menu->func) (menu, gdk_display, (* menu->func) (menu, gdk_display,
menu->client_xwindow, menu->client_xwindow,
gtk_get_current_event_time (),
0, 0, 0, 0,
menu->data); menu->data);
...@@ -122,6 +123,7 @@ activate_cb (GtkWidget *menuitem, gpointer data) ...@@ -122,6 +123,7 @@ activate_cb (GtkWidget *menuitem, gpointer data)
meta_frames_notify_menu_hide (md->menu->frames); meta_frames_notify_menu_hide (md->menu->frames);
(* md->menu->func) (md->menu, gdk_display, (* md->menu->func) (md->menu, gdk_display,
md->menu->client_xwindow, md->menu->client_xwindow,
gtk_get_current_event_time (),
md->op, md->op,
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem), GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem),
"workspace")), "workspace")),
......
...@@ -5613,6 +5613,7 @@ static void ...@@ -5613,6 +5613,7 @@ static void
menu_callback (MetaWindowMenu *menu, menu_callback (MetaWindowMenu *menu,
Display *xdisplay, Display *xdisplay,
Window client_xwindow, Window client_xwindow,
Time timestamp,
MetaMenuOp op, MetaMenuOp op,
int workspace_index, int workspace_index,
gpointer data) gpointer data)
...@@ -5633,7 +5634,7 @@ menu_callback (MetaWindowMenu *menu, ...@@ -5633,7 +5634,7 @@ menu_callback (MetaWindowMenu *menu,
switch (op) switch (op)
{ {
case META_MENU_OP_DELETE: case META_MENU_OP_DELETE:
meta_window_delete (window, meta_display_get_current_time (window->display)); meta_window_delete (window, timestamp);
break; break;
case META_MENU_OP_MINIMIZE: case META_MENU_OP_MINIMIZE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment