← Back to branch summary

~cosmos-door/unity-settings-daemon/lp1514544

« back to all changes in this revision

Viewing changes to plugins/keyboard/gsd-keyboard-manager.c

  • Committer: William Hua
  • Date: 2014-09-04 04:30:41 UTC
  • mto: This revision was merged to the branch mainline in revision 4069.
  • Revision ID: william.hua@canonical.com-20140904043041-lme3xzkorjj31mqu
Finish get_fcitx_engine_for_ibus_engine ().

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/keyboard/gsd-keyboard-manager.c
62
62
#include "gsd-input-helper.h"
63
63
#include "gsd-enums.h"
64
64
 
 
65
#ifdef HAVE_FCITX
 
66
#include "input-method-engines.c"
 
67
#endif
 
68
 
65
69
#define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
66
70
 
67
71
#define GSD_KEYBOARD_DIR "org.gnome.settings-daemon.peripherals.keyboard"
1253
1257
 
1254
1258
#ifdef HAVE_FCITX
1255
1259
static const gchar *
1256
 
get_fcitx_engine_for_ibus_engine (const gchar *engine)
 
1260
get_fcitx_engine_for_ibus_engine (const gchar *ibus_engine)
1257
1261
{
1258
 
        return NULL;
 
1262
        const struct Engine *engine;
 
1263
 
 
1264
        if (!ibus_engine)
 
1265
                return NULL;
 
1266
 
 
1267
        engine = get_engine_for_ibus_engine (ibus_engine, strlen (ibus_engine));
 
1268
 
 
1269
        return engine ? engine->fcitx_engine : NULL;
1259
1270
}
1260
1271
 
1261
1272
static void