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

« back to all changes in this revision

Viewing changes to src/ibus.h

  • 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
* 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:
47
47
#include <ibuskeys.h>
48
48
#include <ibusenumtypes.h>
49
49
#include <ibushotkey.h>
50
 
#include <ibusxkbxml.h>
51
50
#include <ibusxml.h>
52
51
#include <ibusenginedesc.h>
53
52
#include <ibusobservedpath.h>