diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 11 |
5 files changed, 26 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Tue Jul 6 22:58:00 2004 Matthias Clasen <maclas@gmx.de> + + * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time): Fix + a 64bit alignment issue. (#144302, Sunil) + 2004-07-07 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e95a313117..9b3a885c53 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Jul 6 22:58:00 2004 Matthias Clasen <maclas@gmx.de> + + * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time): Fix + a 64bit alignment issue. (#144302, Sunil) + 2004-07-07 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e95a313117..9b3a885c53 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Jul 6 22:58:00 2004 Matthias Clasen <maclas@gmx.de> + + * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time): Fix + a 64bit alignment issue. (#144302, Sunil) + 2004-07-07 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e95a313117..9b3a885c53 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Jul 6 22:58:00 2004 Matthias Clasen <maclas@gmx.de> + + * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time): Fix + a 64bit alignment issue. (#144302, Sunil) + 2004-07-07 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text) diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 43adda9592..79f5fb52c4 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -459,9 +459,9 @@ setup_toplevel_window (GdkWindow *window, GdkWindow *parent) (guchar *) &GDK_DISPLAY_X11 (screen_x11->display)->leader_window, 1); if (!obj->focus_on_map) - gdk_x11_window_set_user_time(window, 0); + gdk_x11_window_set_user_time (window, 0); else if (GDK_DISPLAY_X11 (screen_x11->display)->user_time != 0) - gdk_x11_window_set_user_time(window, GDK_DISPLAY_X11 (screen_x11->display)->user_time); + gdk_x11_window_set_user_time (window, GDK_DISPLAY_X11 (screen_x11->display)->user_time); } /** @@ -3391,6 +3391,7 @@ gdk_x11_window_set_user_time (GdkWindow *window, { GdkDisplay *display; GdkDisplayX11 *display_x11; + glong timestamp_long = (glong)timestamp; g_return_if_fail (window != NULL); g_return_if_fail (GDK_IS_WINDOW (window)); @@ -3404,10 +3405,10 @@ gdk_x11_window_set_user_time (GdkWindow *window, XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window), gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_USER_TIME"), XA_CARDINAL, 32, PropModeReplace, - (guchar *)×tamp, 1); + (guchar *)×tamp_long, 1); - if (timestamp != GDK_CURRENT_TIME) - display_x11->user_time = timestamp; + if (timestamp_long != GDK_CURRENT_TIME) + display_x11->user_time = timestamp_long; } /** |