callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a 64bit alignment issue. (#144302, Sunil)

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2004-07-07 02:59:47 +00:00 committed by Matthias Clasen
parent d8b2f46c18
commit a346f4a8ad
5 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2004-07-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text) * gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text)

5
ChangeLog.pre-2-10
View File

@ -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> 2004-07-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text) * gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text)

5
ChangeLog.pre-2-6
View File

@ -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> 2004-07-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text) * gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text)

5
ChangeLog.pre-2-8
View File

@ -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> 2004-07-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text) * gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text)

11
gdk/x11/gdkwindow-x11.c
View File

@ -459,9 +459,9 @@ setup_toplevel_window (GdkWindow *window, GdkWindow *parent)
(guchar *) &GDK_DISPLAY_X11 (screen_x11->display)->leader_window, 1); (guchar *) &GDK_DISPLAY_X11 (screen_x11->display)->leader_window, 1);
if (!obj->focus_on_map) 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) 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; GdkDisplay *display;
GdkDisplayX11 *display_x11; GdkDisplayX11 *display_x11;
glong timestamp_long = (glong)timestamp;
g_return_if_fail (window != NULL); g_return_if_fail (window != NULL);
g_return_if_fail (GDK_IS_WINDOW (window)); 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), XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_USER_TIME"), gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_USER_TIME"),
XA_CARDINAL, 32, PropModeReplace, XA_CARDINAL, 32, PropModeReplace,
(guchar *)&timestamp, 1); (guchar *)&timestamp_long, 1);
if (timestamp != GDK_CURRENT_TIME) if (timestamp_long != GDK_CURRENT_TIME)
display_x11->user_time = timestamp; display_x11->user_time = timestamp_long;
} }
/** /**