← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ibus/quantal

« back to all changes in this revision

Viewing changes to util/IMdkit/i18nX.c

  • Committer: Bazaar Package Importer
  • Author(s): Barry Warsaw
  • Date: 2011-08-11 17:00:57 UTC
  • mfrom: (6.2.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110811170057-6dmbfs4s3cchzl7x
Tags: 1.3.99.20110419-1ubuntu1
https://launchpad.net/bugs/457632
* Merge with Debian unstable.  Remaining Ubuntu changes:
  - Indicator support:
    + Add 05_appindicator.patch: Use an indicator rather than a notification
      icon.
    + debian/control: Recommend python-appindicator.
  - debian/control: Install im-switch instead of im-config by default.
  - debian/README.source: Removed, it was outdated and no longer correct
  - debian/patches/01_ubuntu_desktop: Fix "Desktop entry needs the
    X-Ubuntu-Gettext-Domain key"  (LP: #457632)
  - debian/patches/02_title_update.patch: Rename "IBus Preferences" to
    "Keyboard Input Methods"
  - debian/patches/06_locale_parser.patch: Cherry-picked from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
util/IMdkit/i18nX.c
395
395
    {
396
396
        unsigned char *packet;
397
397
        XimProtoHdr *hdr;
398
 
        int connect_id_ret;
 
398
        int connect_id_ret = 0;
399
399
 
400
400
        XIfEvent (i18n_core->address.dpy,
401
401
                  &event,
496
496
    XSpecRec *spec = (XSpecRec *) i18n_core->address.connect_addr;
497
497
    Bool delete = True;
498
498
    unsigned char *packet;
499
 
    int connect_id;
 
499
    int connect_id = 0;
500
500
 
501
501
    if (((XClientMessageEvent *) ev)->message_type
502
502
        == spec->xim_request)