[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdelibs4_snapshot/kdecore
From:       Rohan McGovern <rohan.pm () gmail ! com>
Date:       2006-03-22 22:42:44
Message-ID: 1143067364.869828.20789.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 521591 by rohanpm:

Backport genshortcutents crash fix to snapshot.


 M  +10 -0     kstdaccel.cpp  


--- branches/work/kdelibs4_snapshot/kdecore/kstdaccel.cpp #521590:521591
@@ -31,6 +31,9 @@
 #include "kshortcutlist.h"
 
 #include <qkeysequence.h>
+#ifdef Q_WS_X11
+#include <qx11info_x11.h>
+#endif
 
 namespace KStdAccel
 {
@@ -140,6 +143,8 @@
 
 /** Initialize the accelerator @p id by checking if it is overridden
     in the configuration file (and if it isn't, use the default).
+    On X11, if QApplication was initialized with GUI disabled,
+    the default will always be used.
 */
 static void initialize( StdAccel id )
 {
@@ -151,7 +156,12 @@
 		return;
 	}
 
+#ifdef Q_WS_X11
+	// Code within this block breaks if we aren't running in GUI mode.
+	if( QX11Info::display() && cg.hasKey( pInfo->psName ) ) {
+#else
 	if( cg.hasKey( pInfo->psName ) ) {
+#endif	
 		QString s = cg.readEntry( pInfo->psName );
 		if( s != "none" )
 			pInfo->cut.init( s );
[prev in list] [next in list] [prev in thread] [next in thread]