#include "sclconnection-isf.h"
#include "sclcoreimpl.h"
-#include <isf_control.h>
#include <Elementary.h>
#include <dlog.h>
if (impl) {
sclchar *uuid = impl->get_uuid();
if (uuid) {
- sclchar *name = NULL;
- int options = 0;
- if (isf_control_get_ise_info(uuid, &name, NULL, NULL, &options) == 0) {
- m_helper_info.uuid = scim::String(uuid);
- m_helper_info.name = scim::String(name);
- m_helper_info.option = (scluint)options;
- if (name)
- free(name);
- }
+ m_helper_info.uuid = uuid;
}
}
void scim_module_exit (void) {
}
- unsigned int scim_helper_module_number_of_helpers (void) {
- return 1;
- }
-
- bool scim_helper_module_get_helper_info (unsigned int idx, scim::HelperInfo &info) {
- CSCLCoreImpl *impl = CSCLCoreImpl::get_instance();
- if (impl) {
- sclchar *uuid = impl->get_uuid();
- if (uuid) {
- sclchar *name = NULL;
- int options = 0;
- if (isf_control_get_ise_info(uuid, &name, NULL, NULL, &options) == 0) {
- info.uuid = scim::String(uuid);
- info.name = scim::String(name);
- info.option = (scluint)options;
- if (name)
- free(name);
- return true;
- }
- }
- }
- return false;
- }
-
- scim::String scim_helper_module_get_helper_language (unsigned int idx) {
- CSCLCoreImpl *impl = CSCLCoreImpl::get_instance();
- if (impl) {
- sclchar *uuid = impl->get_uuid();
- if (uuid) {
- sclchar *language = NULL;
- if (isf_control_get_ise_info(uuid, NULL, &language, NULL, NULL) == 0) {
- if (language) {
- scim::String lang = scim::String(language);
- free(language);
- return lang;
- }
- }
- }
- }
- return scim::String("");
- }
-
void scim_helper_module_run_helper (const scim::String &uuid, const scim::ConfigPointer &config, const scim::String &display) {
_scim_config = config;
CSCLCoreImpl *impl = CSCLCoreImpl::get_instance();
}
}
}
+
#include "sclcoreui-efl.h"
#include "sclcoreimpl.h"
-#include <isf_control.h>
#include <Elementary.h>
#include <dlog.h>
char *argv[4];
int argc = 3;
- std::string name;
CSCLCoreImpl *impl = CSCLCoreImpl::get_instance();
if (impl) {
sclchar *uuid = impl->get_uuid();
- if (uuid) {
- sclchar *label = NULL;
- if (isf_control_get_ise_info(uuid, &label, NULL, NULL, NULL) == 0) {
- name = std::string(label);
- if (label)
- free(label);
- }
- }
+ if (!uuid)
+ uuid = "";
- argv [0] = const_cast<char *> (name.c_str());
+ argv [0] = const_cast<char *> (uuid);
argv [1] = (char *)"--display";
argv [2] = const_cast<char *> (display);
argv [3] = 0;
elm_policy_set(ELM_POLICY_THROTTLE, ELM_POLICY_THROTTLE_NEVER);
- Evas_Object *main_window = elm_win_add(NULL, name.c_str(), ELM_WIN_UTILITY);
+ Evas_Object *main_window = elm_win_add(NULL, uuid, ELM_WIN_UTILITY);
m_main_window = SCL_WINDOW_CAST(main_window);
elm_win_borderless_set(main_window, EINA_TRUE);
elm_win_keyboard_win_set(main_window, EINA_TRUE);
elm_win_autodel_set(main_window, EINA_TRUE);
- elm_win_title_set(main_window, name.c_str());
+ elm_win_title_set(main_window, uuid);
elm_win_prop_focus_skip_set(main_window, EINA_TRUE);
unsigned int set = 1;