← Back to branch summary

~ubuntu-branches/debian/sid/ibus/sid

« back to all changes in this revision

Viewing changes to debian/patches/ibus-810211-no-switch-by-no-trigger.patch

  • Committer: Package Import Robot
  • Author(s): Osamu Aoki, Aron Xu, Osamu Aoki
  • Date: 2014-08-04 22:42:19 UTC
  • mfrom: (1.5.7)
  • Revision ID: package-import@ubuntu.com-20140804224219-mjprlql1jdwi5sxm
Tags: 1.5.8-1
[ Aron Xu ]
* Allow parallel building

[ Osamu Aoki ]
* Update ibus document with Qt5 support

[ Aron Xu ]
* Imported Upstream version 1.5.8
* Remove patch for chasing HEAD, imported new upstream release
* Remove the patch for updating IBusKeymap jp, applied upstream
* Drop gtk2 version of the password patch because it's never executed
* Drop ibus-541492-xkb.patch
* Drop ibus-530711-preload-sys.patch
* Drop ibus-810211-no-switch-by-no-trigger.patch
* Drop 999-update-po.patch

[ Osamu Aoki ]
* linux-any for ibus-wayland
* Remove some symbols matching ibus-541492-xkb.patch
* Remove old patch for GTK+ 3.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ibus-810211-no-switch-by-no-trigger.patch
1
 
From d3bc903b487bb301395947f692ce0d8c130874e3 Mon Sep 17 00:00:00 2001
2
 
From: fujiwarat <takao.fujiwara1@gmail.com>
3
 
Date: Sat, 6 Oct 2012 17:54:27 +0900
4
 
Subject: [PATCH] Fix not to switch engines by non-trigger keys.
5
 
 
6
 
---
7
 
 ui/gtk3/switcher.vala | 6 ++++++
8
 
 1 file changed, 6 insertions(+)
9
 
 
10
 
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
11
 
index 4a02743..c606682 100644
12
 
--- a/ui/gtk3/switcher.vala
13
 
+++ b/ui/gtk3/switcher.vala
14
 
@@ -140,6 +140,7 @@ class Switcher : Gtk.Window {
15
 
         /* Let gtk recalculate the window size. */
16
 
         resize(1, 1);
17
 
 
18
 
+        m_result = 0;
19
 
         m_selected_engine = index;
20
 
         m_label.set_text(m_buttons[index].longname);
21
 
         m_buttons[index].grab_focus();
22
 
@@ -378,6 +379,11 @@ class Switcher : Gtk.Window {
23
 
                     break;
24
 
                 default:
25
 
                     debug("0x%04x", pe.keyval);
26
 
+                    if (m_loop != null) {
27
 
+                        m_loop.quit();
28
 
+                        m_loop = null;
29
 
+                    }
30
 
+                    retval = false;
31
 
                     break;
32
 
             }
33
 
         } while (false);
34
 
1.8.0
35