← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ibus/utopic

« back to all changes in this revision

Viewing changes to debian/patches/ibus-xx-ctrl-space.patch

  • Committer: Package Import Robot
  • Author(s): Aron Xu
  • Date: 2014-08-18 19:25:16 UTC
  • mfrom: (39.1.12 utopic-proposed)
  • Revision ID: package-import@ubuntu.com-20140818192516-yyvq2gzp8iy2grcf
Tags: 1.5.8-2ubuntu1
https://launchpad.net/bugs/1352805
* Merge from Debian (LP: #1352805), remaining changes:
  - Build with dh-translations
  - ubuntu-title-update.patch: 
    Rename "IBus Preferences" to "Keyboard Input Methods"
  - ubuntu-no-notification.patch: Don't show the notification if not
    actually upgrading from a previous version.
  - ubuntu-disable-trigger.patch: Disable input method switching under
    Unity; it's handled by gnome-settings-daemon.
  - ubuntu-forward-panel-properties.patch:
    Augment the panel service D-Bus interface so that external consumers
    can detect when the panel service properties are changed. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ibus-xx-ctrl-space.patch
1
 
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
2
 
index 007fc66..6c75562 100644
3
 
--- a/data/ibus.schemas.in
4
 
+++ b/data/ibus.schemas.in
5
 
@@ -143,7 +143,7 @@ se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn
6
 
       <owner>ibus</owner>
7
 
       <type>list</type>
8
 
       <list_type>string</list_type>
9
 
-      <default>[&lt;Super&gt;space]</default>
10
 
+      <default>[&lt;Control&gt;space]</default>
11
 
       <locale name="C">
12
 
         <short>Trigger shortcut keys for gtk_accelerator_parse</short>
13
 
           <long>The shortcut keys for turning input method on or off</long>
14
 
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
15
 
index 54251e7..867dbd2 100644
16
 
--- a/ui/gtk3/panel.vala
17
 
+++ b/ui/gtk3/panel.vala
18
 
@@ -354,6 +354,7 @@ class Panel : IBus.PanelService {
19
 
     }
20
 
 
21
 
     private void update_version_1_5_3() {
22
 
+#if 0
23
 
 #if ENABLE_LIBNOTIFY
24
 
         if (!Notify.is_initted()) {
25
 
             Notify.init ("ibus");
26
 
@@ -374,6 +375,7 @@ class Panel : IBus.PanelService {
27
 
 #else
28
 
         warning(_("Super+space is now the default hotkey."));
29
 
 #endif
30
 
+#endif
31
 
     }
32
 
 
33
 
     private void set_version() {