summaryrefslogtreecommitdiff
path: root/src/delete.c
diff options
context:
space:
mode:
authorElijah Newren <newren gmail com>2006-09-13 16:32:33 +0000
committerElijah Newren <newren@src.gnome.org>2006-09-13 16:32:33 +0000
commit3b0478776df99364929cbd8db72b7dc06c24d030 (patch)
tree1efda9b27b829b44405e56448a1c53851c0159b8 /src/delete.c
parentc53538b1c26482c2cac3e209d0e77a00347feb96 (diff)
downloadmetacity-3b0478776df99364929cbd8db72b7dc06c24d030.tar.gz
metacity-3b0478776df99364929cbd8db72b7dc06c24d030.tar.bz2
Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+
2006-09-13 Elijah Newren <newren gmail com> * src/common.h (MetaWindowMenuFunc): * src/core.[ch] (meta_core_user_lower_and_unfocus, meta_core_user_focus, meta_core_show_window_menu, meta_core_begin_grab_op, meta_core_end_grab_op): * src/delete.c (delete_ping_reply_func, delete_ping_timeout_func, meta_window_delete): * src/display.[ch] (struct MetaDisplay, struct MetaPingData, sanity_check_timestamps, meta_display_open, event_callback, meta_spew_event, meta_display_set_grab_op_cursor, meta_display_begin_grab_op, meta_display_end_grab_op, meta_display_ping_timeout, meta_display_ping_window, process_pong_message, timestamp_too_old, meta_display_set_input_focus_window): * src/keybindings.[ch] (grab_keyboard, ungrab_keyboard, meta_screen_grab_all_keys, meta_window_grab_all_keys, meta_window_ungrab_all_keys, error_on_generic_command, error_on_command, error_on_terminal_command): * src/metacity-dialog.c (on_realize, warn_about_no_sm_support, error_about_command, main): * src/screen.[ch] (struct _MetaScreen, meta_screen_new, meta_screen_show_desktop, meta_screen_apply_startup_properties): * src/session.c (warn_about_lame_clients_and_finish_interact): * src/window.[ch] (struct _MetaWindow, intervening_user_event_occurred, window_activate, meta_window_delete, meta_window_focus, meta_window_send_icccm_message, meta_window_client_message, menu_callback, meta_window_show_menu, struct EventScannerData, check_use_this_motion_notify, meta_window_begin_grab_op, meta_window_set_user_time): * src/workspace.[ch] (focus_ancestor_or_mru_window, meta_workspace_activate_with_focus, meta_workspace_activate, meta_workspace_focus_default_window, focus_ancestor_or_mru_window): Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+ does) instead of Time. #348305
Diffstat (limited to 'src/delete.c')
-rw-r--r--src/delete.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/delete.c b/src/delete.c
index 3cbf78d..01996bf 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -39,7 +39,7 @@ static void meta_window_present_delete_dialog (MetaWindow *window);
static void
delete_ping_reply_func (MetaDisplay *display,
Window xwindow,
- Time timestamp,
+ guint32 timestamp,
void *user_data)
{
meta_topic (META_DEBUG_PING,
@@ -292,7 +292,7 @@ io_from_ping_dialog (GIOChannel *channel,
static void
delete_ping_timeout_func (MetaDisplay *display,
Window xwindow,
- Time timestamp,
+ guint32 timestamp,
void *user_data)
{
MetaWindow *window = user_data;
@@ -318,7 +318,7 @@ delete_ping_timeout_func (MetaDisplay *display,
window_id_str = g_strdup_printf ("0x%lx", window->xwindow);
sprintf (numbuf, "%d", window->screen->number);
- sprintf (timestampbuf, "%lu", timestamp);
+ sprintf (timestampbuf, "%u", timestamp);
argv[0] = METACITY_LIBEXECDIR"/metacity-dialog";
argv[1] = "--screen";
@@ -364,7 +364,7 @@ delete_ping_timeout_func (MetaDisplay *display,
void
meta_window_delete (MetaWindow *window,
- Time timestamp)
+ guint32 timestamp)
{
meta_error_trap_push (window->display);
if (window->delete_window)