← Back to branch summary

~ubuntu-branches/ubuntu/vivid/scim-bridge/vivid

« back to all changes in this revision

Viewing changes to debian/patches/50_fix_qt4_focus.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-06-25 22:02:52 UTC
  • mfrom: (1.1.9 upstream) (6.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090625220252-2qn0jwi9re34zcth
Tags: 0.4.16-2ubuntu1
* Resynchronise with Debian. Remaining changes:
  - 50_check_scim_binary.dpatch: Fix 10-20s delay in launching apps when
    scim is not running.
  - 50_fix_qt4_focus.dpatch: Fix focus loss under KDE 4.
  - 51_quiet.dpatch: Turn some error messages into debug lines.
  - Just have scim-bridge-agent depend on scim, not scim | skim.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/50_fix_qt4_focus.dpatch
6
6
 
7
7
@DPATCH@
8
8
 
9
 
diff -ruNad scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp scim-bridge-0.4.15-work/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
10
 
--- scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp        2007-07-07 02:30:10.000000000 +0000
11
 
+++ scim-bridge-0.4.15-work/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp   2008-09-24 13:32:45.000000000 +0000
 
9
diff -ruNad scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp scim-bridge-0.4.15-work/client-qt/scim-bridge-client-imcontext-qt.cpp
 
10
--- scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp    2007-07-07 02:30:10.000000000 +0000
 
11
+++ scim-bridge-0.4.15-work/client-qt/scim-bridge-client-imcontext-qt.cpp       2008-09-24 13:32:45.000000000 +0000
12
12
@@ -220,7 +220,12 @@
13
13
 {
14
14
     scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");