From 8a4eacb6185de3653f6ae401c352aef833a9e72a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 4 May 2013 02:29:16 -0500 Subject: Fix incorrect renaming of RETQUEST --- src/kernel/qapplication_x11.cpp | 6 +++--- src/kernel/qwidget_x11.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/kernel') diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 41abcb20e..e9fee790c 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -2064,8 +2064,8 @@ void tqt_init_internal( int *argcptr, char **argv, qt_x11_intern_atom( "_SGI_DESKS_MANAGER", &qt_sgi_desks_manager ); #ifndef QT_NO_XSYNC - qt_x11_intern_atom( "_NET_WM_SYNC_RETQUEST_COUNTER", &qt_net_wm_sync_request_counter ); - qt_x11_intern_atom( "_NET_WM_SYNC_RETQUEST", &qt_net_wm_sync_request ); + qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST_COUNTER", &qt_net_wm_sync_request_counter ); + qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST", &qt_net_wm_sync_request ); #endif qt_xdnd_setup(); @@ -5977,7 +5977,7 @@ bool TQETWidget::translateConfigEvent( const XEvent *event ) ++compressed_configs; } #ifndef QT_NO_XSYNC - // _NET_WM_SYNC_RETQUEST compression + // _NET_WM_SYNC_REQUEST compression Window wid = winId(); while ( compressed_configs && XCheckIfEvent( x11Display(), &otherEvent, diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 1479342e9..8e9cc3abc 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/src/kernel/qwidget_x11.cpp @@ -684,7 +684,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) protocols[n++] = tqt_wm_take_focus; // support take focus window protocol protocols[n++] = qt_net_wm_ping; // support _NET_WM_PING protocol #ifndef QT_NO_XSYNC - protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_RETQUEST protocol + protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_REQUEST protocol #endif if ( testWFlags( WStyle_ContextHelp ) ) protocols[n++] = qt_net_wm_context_help; @@ -2698,7 +2698,7 @@ void TQWidget::incrementSyncCounter() } } -// handle _NET_WM_SYNC_RETQUEST +// handle _NET_WM_SYNC_REQUEST void TQWidget::handleSyncRequest( void* ev ) { XEvent* xev = (XEvent*)ev; -- cgit v1.2.1