Author: olivier
Date: 2008-10-22 19:58:39 +0000 (Wed, 22 Oct 2008)
New Revision: 28362
Modified:
xfwm4/branches/xfce_4_4/NEWS
xfwm4/branches/xfce_4_4/src/client.c
xfwm4/branches/xfce_4_4/src/client.h
xfwm4/branches/xfce_4_4/src/display.c
xfwm4/branches/xfce_4_4/src/display.h
xfwm4/branches/xfce_4_4/src/events.c
xfwm4/branches/xfce_4_4/src/focus.c
xfwm4/branches/xfce_4_4/src/focus.h
xfwm4/branches/xfce_4_4/src/hints.c
xfwm4/branches/xfce_4_4/src/hints.h
xfwm4/branches/xfce_4_4/src/misc.c
xfwm4/branches/xfce_4_4/src/misc.h
xfwm4/branches/xfce_4_4/src/netwm.c
xfwm4/branches/xfce_4_4/src/screen.c
xfwm4/branches/xfce_4_4/src/screen.h
xfwm4/branches/xfce_4_4/src/startup_notification.c
xfwm4/branches/xfce_4_4/src/workspaces.c
xfwm4/branches/xfce_4_4/src/workspaces.h
Log:
Use guint32 instead of Time internally to avoid potential issues in 64bits
Modified: xfwm4/branches/xfce_4_4/NEWS
===================================================================
--- xfwm4/branches/xfce_4_4/NEWS 2008-10-22 19:48:34 UTC (rev 28361)
+++ xfwm4/branches/xfce_4_4/NEWS 2008-10-22 19:58:39 UTC (rev 28362)
@@ -19,6 +19,7 @@
- Take gravity bit into account in configure resize only requests to comply
with standard (bug #3634)
- Add client windows to save set to avoid loosing all windows in case of crash
+- Use guint32 instead of Time internally to avoid potential issues in 64bits
4.4.2
=====
Modified: xfwm4/branches/xfce_4_4/src/client.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/client.c 2008-10-22 19:48:34 UTC (rev
28361)
+++ xfwm4/branches/xfce_4_4/src/client.c 2008-10-22 19:58:39 UTC (rev
28362)
@@ -1769,7 +1769,7 @@
screen_info = c->screen_info;
display_info = screen_info->display_info;
- if (getNetWMUserTime (display_info, c->window, &c->user_time))
+ if (getNetWMUserTime (display_info, c->window, &c->user_time) &&
(c->user_time != 0))
{
FLAG_SET (c->flags, CLIENT_FLAG_HAS_USER_TIME);
myDisplaySetLastUserTime (display_info, c->user_time);
@@ -2076,6 +2076,7 @@
c->fullscreen_old_layer = c->win_layer;
/* net_wm_user_time standard */
+ c->user_time = 0;
clientGetUserTime (c);
/* Apply startup notification properties if available */
@@ -2810,7 +2811,7 @@
}
void
-clientActivate (Client * c, Time timestamp)
+clientActivate (Client * c, guint32 timestamp)
{
ScreenInfo *screen_info;
@@ -3789,7 +3790,7 @@
static int edge_scroll_x = 0;
static int edge_scroll_y = 0;
static gboolean toggled_maximize = FALSE;
- static Time lastresist = (Time) 0;
+ static guint32 lastresist = 0;
unsigned long configure_flags;
ScreenInfo *screen_info;
DisplayInfo *display_info;
@@ -4072,7 +4073,7 @@
}
warp_pointer = TRUE;
}
- lastresist = (Time) 0;
+ lastresist = 0;
}
if (edge_scroll_y > screen_info->params->wrap_resistance)
{
@@ -4095,7 +4096,7 @@
}
warp_pointer = TRUE;
}
- lastresist = (Time) 0;
+ lastresist = 0;
}
if (warp_pointer)
Modified: xfwm4/branches/xfce_4_4/src/client.h
===================================================================
--- xfwm4/branches/xfce_4_4/src/client.h 2008-10-22 19:48:34 UTC (rev
28361)
+++ xfwm4/branches/xfce_4_4/src/client.h 2008-10-22 19:58:39 UTC (rev
28362)
@@ -267,7 +267,7 @@
int button_pressed[BUTTON_COUNT];
int struts[STRUTS_SIZE];
gchar *name;
- Time user_time;
+ guint32 user_time;
unsigned long flags;
unsigned long wm_flags;
unsigned long xfwm_flags;
@@ -357,7 +357,7 @@
void clientClearAllShowDesktop (ScreenInfo *);
void clientToggleShowDesktop (ScreenInfo *);
void clientActivate (Client *,
- Time);
+ guint32);
void clientClose (Client *);
void clientKill (Client *);
void clientEnterContextMenuState (Client *);
Modified: xfwm4/branches/xfce_4_4/src/display.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/display.c 2008-10-22 19:48:34 UTC (rev
28361)
+++ xfwm4/branches/xfce_4_4/src/display.c 2008-10-22 19:58:39 UTC (rev
28362)
@@ -686,82 +686,82 @@
return NULL;
}
-Time
+guint32
myDisplayUpdateCurrentTime (DisplayInfo *display, XEvent *ev)
{
- g_return_val_if_fail (display != NULL, (Time) CurrentTime);
+ g_return_val_if_fail (display != NULL, CurrentTime);
switch (ev->type)
{
case KeyPress:
case KeyRelease:
- display->current_time = (Time) ev->xkey.time;
+ display->current_time = (guint32) ev->xkey.time;
break;
case ButtonPress:
case ButtonRelease:
- display->current_time = (Time) ev->xbutton.time;
+ display->current_time = (guint32) ev->xbutton.time;
break;
case MotionNotify:
- display->current_time = (Time) ev->xmotion.time;
+ display->current_time = (guint32) ev->xmotion.time;
break;
case EnterNotify:
case LeaveNotify:
- display->current_time = (Time) ev->xcrossing.time;
+ display->current_time = (guint32) ev->xcrossing.time;
break;
case PropertyNotify:
- display->current_time = (Time) ev->xproperty.time;
+ display->current_time = (guint32) ev->xproperty.time;
break;
case SelectionClear:
- display->current_time = (Time) ev->xselectionclear.time;
+ display->current_time = (guint32) ev->xselectionclear.time;
break;
case SelectionRequest:
- display->current_time = (Time) ev->xselectionrequest.time;
+ display->current_time = (guint32) ev->xselectionrequest.time;
break;
case SelectionNotify:
- display->current_time = (Time) ev->xselection.time;
+ display->current_time = (guint32) ev->xselection.time;
break;
default:
- display->current_time = (Time) CurrentTime;
+ display->current_time = (guint32) CurrentTime;
break;
}
return display->current_time;
}
-Time
+guint32
myDisplayGetCurrentTime (DisplayInfo *display)
{
- g_return_val_if_fail (display != NULL, (Time) CurrentTime);
+ g_return_val_if_fail (display != NULL, CurrentTime);
- TRACE ("myDisplayGetCurrentTime gives timestamp=%u", (unsigned int)
display->current_time);
- return (Time) display->current_time;
+ TRACE ("myDisplayGetCurrentTime gives timestamp=%u", (guint32)
display->current_time);
+ return display->current_time;
}
-Time
-myDisplayGetTime (DisplayInfo * display, Time timestamp)
+guint32
+myDisplayGetTime (DisplayInfo * display, guint32 timestamp)
{
- Time time;
+ guint32 time;
time = timestamp;
- if (time == (Time) CurrentTime)
+ if (time == CurrentTime)
{
time = getXServerTime (display);
}
- TRACE ("myDisplayGetTime gives timestamp=%u", (unsigned int) time);
- return (time);
+ TRACE ("myDisplayGetTime gives timestamp=%u", (guint32) time);
+ return time;
}
-Time
+guint32
myDisplayGetLastUserTime (DisplayInfo *display)
{
- g_return_val_if_fail (display != NULL, (Time) CurrentTime);
+ g_return_val_if_fail (display != NULL, CurrentTime);
- TRACE ("myDisplayGetLastUserTime gives timestamp=%u", (unsigned int)
display->last_user_time);
- return (Time) display->last_user_time;
+ TRACE ("myDisplayGetLastUserTime gives timestamp=%u", (guint32)
display->last_user_time);
+ return display->last_user_time;
}
void
-myDisplaySetLastUserTime (DisplayInfo *display, Time timestamp)
+myDisplaySetLastUserTime (DisplayInfo *display, guint32 timestamp)
{
g_return_if_fail (display != NULL);
Modified: xfwm4/branches/xfce_4_4/src/display.h
===================================================================
--- xfwm4/branches/xfce_4_4/src/display.h 2008-10-22 19:48:34 UTC (rev
28361)
+++ xfwm4/branches/xfce_4_4/src/display.h 2008-10-22 19:58:39 UTC (rev
28362)
@@ -255,8 +255,8 @@
gint nb_screens;
gchar* hostname;
- Time current_time;
- Time last_user_time;
+ guint32 current_time;
+ guint32 last_user_time;
gboolean enable_compositor;
#ifdef HAVE_RENDER
@@ -338,14 +338,14 @@
XSyncAlarm);
#endif /* HAVE_XSYNC */
ScreenInfo *myDisplayGetDefaultScreen (DisplayInfo
*);
-Time myDisplayUpdateCurrentTime (DisplayInfo *,
+guint32 myDisplayUpdateCurrentTime (DisplayInfo *,
XEvent *);
-Time myDisplayGetCurrentTime (DisplayInfo
*);
-Time myDisplayGetTime (DisplayInfo *,
- Time);
-Time myDisplayGetLastUserTime (DisplayInfo
*);
+guint32 myDisplayGetCurrentTime (DisplayInfo
*);
+guint32 myDisplayGetTime (DisplayInfo *,
+ guint32);
+guint32 myDisplayGetLastUserTime (DisplayInfo
*);
void myDisplaySetLastUserTime (DisplayInfo *,
- Time);
+ guint32);
gboolean myDisplayTestXrender (DisplayInfo *,
gdouble);
Modified: xfwm4/branches/xfce_4_4/src/events.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/events.c 2008-10-22 19:48:34 UTC (rev
28361)
+++ xfwm4/branches/xfce_4_4/src/events.c 2008-10-22 19:58:39 UTC (rev
28362)
@@ -258,7 +258,7 @@
static gboolean
check_button_time (XButtonEvent *ev)
{
- static Time last_button_time = (Time) CurrentTime;
+ static guint32 last_button_time = CurrentTime;
if (last_button_time > ev->time)
{
@@ -841,7 +841,7 @@
static void
rootScrollButton (DisplayInfo *display_info, XButtonEvent * ev)
{
- static Time lastscroll = (Time) CurrentTime;
+ static guint32 lastscroll = CurrentTime;
ScreenInfo *screen_info;
if ((ev->time - lastscroll) < 25) /* ms */
@@ -1380,7 +1380,7 @@
static void
handleEnterNotify (DisplayInfo *display_info, XCrossingEvent * ev)
{
- static Time lastresist = (Time) CurrentTime;
+ static guint32 lastresist = CurrentTime;
ScreenInfo *screen_info;
Client *c;
gboolean warp_pointer;
@@ -1834,7 +1834,7 @@
else if (ev->atom == display_info->atoms[NET_WM_USER_TIME])
{
TRACE ("client \"%s\" (0x%lx) has received a NET_WM_USER_TIME
notify", c->name, c->window);
- if (getNetWMUserTime (display_info, c->window, &c->user_time))
+ if (getNetWMUserTime (display_info, c->window, &c->user_time) &&
(c->user_time != 0))
{
myDisplaySetLastUserTime (display_info, c->user_time);
FLAG_SET (c->flags, CLIENT_FLAG_HAS_USER_TIME);
@@ -2007,17 +2007,17 @@
else if ((ev->message_type == display_info->atoms[NET_ACTIVE_WINDOW])
&& (ev->format == 32))
{
gboolean source_is_application;
- Time ev_time;
+ guint32 ev_time;
- ev_time = myDisplayGetTime (display_info, (Time) ev->data.l[1]);
+ ev_time = myDisplayGetTime (display_info, (guint32) ev->data.l[1]);
source_is_application = (ev->data.l[0] == 1);
TRACE ("client \"%s\" (0x%lx) has received a NET_ACTIVE_WINDOW
event", c->name, c->window);
if (source_is_application)
{
- Time current = myDisplayGetLastUserTime (display_info);
+ guint32 current = myDisplayGetLastUserTime (display_info);
- TRACE ("Time of event received is %u, current XServer time is
%u", (unsigned int) ev_time, (unsigned int) current);
+ TRACE ("Time of event received is %u, current XServer time is
%u", (guint32) ev_time, (guint32) current);
if ((screen_info->params->prevent_focus_stealing) &&
TIMESTAMP_IS_BEFORE(ev_time, current))
{
TRACE ("Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\"
(0x%lx)", c->name, c->window);
@@ -2058,7 +2058,7 @@
(ev->data.l[0] != screen_info->current_ws))
{
workspaceSwitch (screen_info, ev->data.l[0], NULL, TRUE,
- myDisplayGetTime (display_info, (Time)
ev->data.l[1]));
+ myDisplayGetTime (display_info, (guint32)
ev->data.l[1]));
}
}
else if (((ev->message_type ==
display_info->atoms[WIN_WORKSPACE_COUNT]) ||
Modified: xfwm4/branches/xfce_4_4/src/focus.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/focus.c 2008-10-22 19:48:34 UTC (rev 28361)
+++ xfwm4/branches/xfce_4_4/src/focus.c 2008-10-22 19:58:39 UTC (rev 28362)
@@ -100,7 +100,7 @@
}
void
-clientFocusTop (ScreenInfo *screen_info, int layer, Time timestamp)
+clientFocusTop (ScreenInfo *screen_info, int layer, guint32 timestamp)
{
ClientPair top_client;
DisplayInfo *display_info;
@@ -145,7 +145,7 @@
}
else if ((client_focus) && (prevent_focus_stealing))
{
- if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_STARTUP_TIME) &&
(c->user_time == (Time) CurrentTime))
+ if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_STARTUP_TIME) &&
(c->user_time == CurrentTime))
{
TRACE ("Given startup time is 0, not focusing");
give_focus = FALSE;
@@ -484,7 +484,7 @@
}
void
-clientSetFocus (ScreenInfo *screen_info, Client * c, Time timestamp, unsigned
short flags)
+clientSetFocus (ScreenInfo *screen_info, Client * c, guint32 timestamp,
unsigned short flags)
{
DisplayInfo *display_info;
Client *c2;
Modified: xfwm4/branches/xfce_4_4/src/focus.h
===================================================================
--- xfwm4/branches/xfce_4_4/src/focus.h 2008-10-22 19:48:34 UTC (rev 28361)
+++ xfwm4/branches/xfce_4_4/src/focus.h 2008-10-22 19:58:39 UTC (rev 28362)
@@ -39,7 +39,7 @@
void clientFocusTop (ScreenInfo *,
int,
- Time);
+ guint32);
gboolean clientFocusNew (Client *);
gboolean clientSelectMask (Client *,
int,
@@ -58,7 +58,7 @@
unsigned
short);
void clientSetFocus (ScreenInfo *,
Client *,
- Time,
+ guint32,
unsigned
short);
void clientInitFocusFlag (Client *);
Client *clientGetFocus (void);
Modified: xfwm4/branches/xfce_4_4/src/hints.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/hints.c 2008-10-22 19:48:34 UTC (rev 28361)
+++ xfwm4/branches/xfce_4_4/src/hints.c 2008-10-22 19:58:39 UTC (rev 28362)
@@ -947,7 +947,7 @@
}
gboolean
-getNetWMUserTime (DisplayInfo *display_info, Window window, Time *time)
+getNetWMUserTime (DisplayInfo *display_info, Window window, guint32 *time)
{
Atom actual_type;
int actual_format;
@@ -966,12 +966,12 @@
if ((data) && (actual_type == XA_CARDINAL)
&& (nitems == 1) && (bytes_after == 0))
{
- *time = *((long *) data);
+ *time = *((guint32 *) data);
XFree (data);
return TRUE;
}
}
- *time = (Time) 0;
+ *time = 0;
return FALSE;
}
@@ -1127,7 +1127,7 @@
setXAtomManagerOwner (DisplayInfo *display_info, Atom atom, Window root,
Window w)
{
XClientMessageEvent ev;
- Time server_time;
+ guint32 server_time;
int status;
g_return_val_if_fail (root != None, FALSE);
@@ -1181,27 +1181,27 @@
8, PropModeReplace, (unsigned char *) &c, 1);
}
-Time
+guint32
getXServerTime (DisplayInfo *display_info)
{
ScreenInfo *screen_info;
XEvent xevent;
- Time timestamp;
+ guint32 timestamp;
- g_return_val_if_fail (display_info, (Time) CurrentTime);
+ g_return_val_if_fail (display_info, CurrentTime);
timestamp = myDisplayGetCurrentTime (display_info);
- if (timestamp == (Time) CurrentTime)
+ if (timestamp == CurrentTime)
{
screen_info = myDisplayGetDefaultScreen (display_info);
- g_return_val_if_fail (screen_info, (Time) CurrentTime);
+ g_return_val_if_fail (screen_info, CurrentTime);
TRACE ("getXServerTime: Using X server roundtrip");
updateXserverTime (display_info);
XWindowEvent (display_info->dpy, display_info->timestamp_win,
PropertyChangeMask, &xevent);
- timestamp = (Time) myDisplayUpdateCurrentTime (display_info, &xevent);
+ timestamp = myDisplayUpdateCurrentTime (display_info, &xevent);
}
- TRACE ("getXServerTime gives timestamp=%u", (unsigned int) timestamp);
+ TRACE ("getXServerTime gives timestamp=%u", timestamp);
return timestamp;
}
Modified: xfwm4/branches/xfce_4_4/src/hints.h
===================================================================
--- xfwm4/branches/xfce_4_4/src/hints.h 2008-10-22 19:48:34 UTC (rev 28361)
+++ xfwm4/branches/xfce_4_4/src/hints.h 2008-10-22 19:58:39 UTC (rev 28362)
@@ -240,7 +240,7 @@
Window);
gboolean getNetWMUserTime (DisplayInfo
*,
Window,
- Time *);
+ guint32 *);
gboolean getClientID (DisplayInfo
*,
Window,
gchar **);
@@ -270,7 +270,7 @@
Window ,
Window);
void updateXserverTime (DisplayInfo
*);
-Time getXServerTime (DisplayInfo
*);
+guint32 getXServerTime (DisplayInfo
*);
#ifdef ENABLE_KDE_SYSTRAY_PROXY
gboolean checkKdeSystrayWindow (DisplayInfo
*,
Modified: xfwm4/branches/xfce_4_4/src/misc.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/misc.c 2008-10-22 19:48:34 UTC (rev 28361)
+++ xfwm4/branches/xfce_4_4/src/misc.c 2008-10-22 19:58:39 UTC (rev 28362)
@@ -104,7 +104,7 @@
}
void
-sendClientMessage (ScreenInfo *screen_info, Window w, int atom_id, Time
timestamp)
+sendClientMessage (ScreenInfo *screen_info, Window w, int atom_id, guint32
timestamp)
{
DisplayInfo *display_info;
XClientMessageEvent ev;
@@ -124,7 +124,7 @@
}
void
-sendRootMessage (ScreenInfo *screen_info, int atom_id, long value, Time
timestamp)
+sendRootMessage (ScreenInfo *screen_info, int atom_id, long value, guint32
timestamp)
{
DisplayInfo *display_info;
XClientMessageEvent ev;
Modified: xfwm4/branches/xfce_4_4/src/misc.h
===================================================================
--- xfwm4/branches/xfce_4_4/src/misc.h 2008-10-22 19:48:34 UTC (rev 28361)
+++ xfwm4/branches/xfce_4_4/src/misc.h 2008-10-22 19:58:39 UTC (rev 28362)
@@ -58,11 +58,11 @@
void sendClientMessage (ScreenInfo *,
Window,
int,
- Time);
+ guint32);
void sendRootMessage (ScreenInfo *,
int,
long,
- Time);
+ guint32);
gboolean checkWindowOnRoot (ScreenInfo *,
Window);
void placeSidewalks (ScreenInfo *,
Modified: xfwm4/branches/xfce_4_4/src/netwm.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/netwm.c 2008-10-22 19:48:34 UTC (rev 28361)
+++ xfwm4/branches/xfce_4_4/src/netwm.c 2008-10-22 19:58:39 UTC (rev 28362)
@@ -608,7 +608,7 @@
event->xbutton.button = button;
event->xbutton.x_root = event->xkey.x_root = x_root;
event->xbutton.y_root = event->xkey.y_root = y_root;
- event->xbutton.time = event->xkey.time = myDisplayGetCurrentTime
(display_info);
+ event->xbutton.time = event->xkey.time = (Time) myDisplayGetCurrentTime
(display_info);
switch (action)
{
Modified: xfwm4/branches/xfce_4_4/src/screen.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/screen.c 2008-10-22 19:48:34 UTC (rev
28361)
+++ xfwm4/branches/xfce_4_4/src/screen.c 2008-10-22 19:58:39 UTC (rev
28362)
@@ -304,7 +304,7 @@
}
gboolean
-myScreenGrabKeyboard (ScreenInfo *screen_info, Time time)
+myScreenGrabKeyboard (ScreenInfo *screen_info, guint32 time)
{
gboolean grab;
@@ -319,7 +319,7 @@
screen_info->xfwm4_win,
FALSE,
GrabModeAsync, GrabModeAsync,
- time) == GrabSuccess);
+ (Time) time) == GrabSuccess);
}
screen_info->key_grabs++;
TRACE ("global key grabs %i", screen_info->key_grabs);
@@ -340,7 +340,7 @@
}
gboolean
-myScreenGrabPointer (ScreenInfo *screen_info, unsigned int event_mask, Cursor
cursor, Time time)
+myScreenGrabPointer (ScreenInfo *screen_info, unsigned int event_mask, Cursor
cursor, guint32 time)
{
gboolean grab;
@@ -356,7 +356,7 @@
GrabModeAsync, GrabModeAsync,
screen_info->xroot,
cursor,
- time) == GrabSuccess);
+ (Time) time) == GrabSuccess);
}
screen_info->pointer_grabs++;
TRACE ("global pointer grabs %i", screen_info->pointer_grabs);
Modified: xfwm4/branches/xfce_4_4/src/screen.h
===================================================================
--- xfwm4/branches/xfce_4_4/src/screen.h 2008-10-22 19:48:34 UTC (rev
28361)
+++ xfwm4/branches/xfce_4_4/src/screen.h 2008-10-22 19:58:39 UTC (rev
28362)
@@ -169,11 +169,11 @@
gboolean myScreenCheckWMAtom (ScreenInfo *,
Atom atom);
gboolean myScreenGrabKeyboard (ScreenInfo *,
- Time);
+ guint32);
gboolean myScreenGrabPointer (ScreenInfo *,
unsigned int,
Cursor,
- Time);
+ guint32);
unsigned int myScreenUngrabKeyboard (ScreenInfo *);
unsigned int myScreenUngrabPointer (ScreenInfo *);
void myScreenGrabKeys (ScreenInfo *);
Modified: xfwm4/branches/xfce_4_4/src/startup_notification.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/startup_notification.c 2008-10-22 19:48:34 UTC
(rev 28361)
+++ xfwm4/branches/xfce_4_4/src/startup_notification.c 2008-10-22 19:58:39 UTC
(rev 28362)
@@ -280,12 +280,12 @@
if (sequence != NULL)
{
int workspace;
- Time timestamp;
+ guint32 timestamp;
/* Set initial time */
timestamp = sn_startup_sequence_get_timestamp (sequence);
TRACE ("Given startup time: %u", (unsigned int) timestamp);
- if ((c->user_time == (Time) 0) || TIMESTAMP_IS_BEFORE(c->user_time,
timestamp))
+ if ((c->user_time == 0) || TIMESTAMP_IS_BEFORE(c->user_time,
timestamp))
{
c->user_time = timestamp;
myDisplaySetLastUserTime (screen_info->display_info, c->user_time);
Modified: xfwm4/branches/xfce_4_4/src/workspaces.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/workspaces.c 2008-10-22 19:48:34 UTC (rev
28361)
+++ xfwm4/branches/xfce_4_4/src/workspaces.c 2008-10-22 19:58:39 UTC (rev
28362)
@@ -176,7 +176,7 @@
/* returns TRUE if the workspace was changed, FALSE otherwise */
gboolean
-workspaceMove (ScreenInfo *screen_info, int rowmod, int colmod, Client * c,
Time timestamp)
+workspaceMove (ScreenInfo *screen_info, int rowmod, int colmod, Client * c,
guint32 timestamp)
{
int row, col, newrow, newcol, previous_ws, n;
@@ -229,7 +229,7 @@
}
void
-workspaceSwitch (ScreenInfo *screen_info, int new_ws, Client * c2, gboolean
update_focus, Time timestamp)
+workspaceSwitch (ScreenInfo *screen_info, int new_ws, Client * c2, gboolean
update_focus, guint32 timestamp)
{
DisplayInfo *display_info;
Client *c, *new_focus;
Modified: xfwm4/branches/xfce_4_4/src/workspaces.h
===================================================================
--- xfwm4/branches/xfce_4_4/src/workspaces.h 2008-10-22 19:48:34 UTC (rev
28361)
+++ xfwm4/branches/xfce_4_4/src/workspaces.h 2008-10-22 19:58:39 UTC (rev
28362)
@@ -39,12 +39,12 @@
int,
int,
Client *,
- Time);
+ guint32);
void workspaceSwitch (ScreenInfo *,
int,
Client *,
gboolean,
- Time);
+ guint32);
void workspaceSetNames (ScreenInfo *,
gchar **,
int);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
