diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-10-03 16:36:26 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:52 +0100 |
| commit | c529623457889a67473f773d080941903e2784fc (patch) | |
| tree | a8a41cbb19a3063d10c22db8e6fe6d5dddc5960b /vcl/unx/kde4 | |
| parent | f88ff49c733392e66dd178928efa3d807f2cffca (diff) | |
generic: re-work X error push/pop and error message handling
Diffstat (limited to 'vcl/unx/kde4')
| -rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index ad46e61f4c44..a5804b39b5e4 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -178,16 +178,7 @@ void KDEXLib::Init() SalKDEDisplay *pSalDisplay = new SalKDEDisplay(pDisp); pInputMethod->CreateMethod( pDisp ); - pSalDisplay->SetInputMethod( pInputMethod ); - - PushXErrorLevel( true ); - SalI18N_KeyboardExtension *pKbdExtension = new SalI18N_KeyboardExtension( pDisp ); - XSync( pDisp, False ); - - pKbdExtension->UseExtension( ! HasXErrorOccurred() ); - PopXErrorLevel(); - - pSalDisplay->SetKbdExtension( pKbdExtension ); + pSalDisplay->SetupInput( pInputMethod ); } // When we use Qt event loop, it can actually use its own event loop handling, or wrap |