← Back to branch summary

~michael-sheldon/ubuntu-keyboard/fix-1402878

« back to all changes in this revision

Viewing changes to src/plugin/inputmethod.cpp

  • Committer: Christopher Lee
  • Date: 2013-08-13 03:11:49 UTC
  • mto: This revision was merged to the branch mainline in revision 23.
  • Revision ID: chris.lee@canonical.com-20130813031149-ra0ia30dozfgduf5
Merge in changes from previous repo. Updated for using new repo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugin/inputmethod.cpp
245
245
    QObject::connect(&layout.updater, SIGNAL(languageChanged(QString)),
246
246
                     &editor,  SLOT(onLanguageChanged(const QString&)));
247
247
 
 
248
    QObject::connect(&layout.helper, SIGNAL(stateChanged(Model::Layout::State)),
 
249
                     &layout.model,  SLOT(setState(Model::Layout::State)));
 
250
 
248
251
#ifdef EXTENDED_SURFACE_TEMP_DISABLED
249
252
    QObject::connect(&layout.event_handler,          SIGNAL(extendedKeysShown(Key)),
250
253
                     &extended_layout.event_handler, SLOT(onExtendedKeysShown(Key)));