PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(WAYLAND, [wayland-client >= 1.2.0])
-PKG_CHECK_MODULES(EFL, [eina eet evas ecore ecore-evas ecore-wayland edje])
+PKG_CHECK_MODULES(EFL, [eina evas ecore ecore-evas ecore-wayland edje])
AC_ARG_WITH(edje-cc,
AS_HELP_STRING([--with-edje-cc=PATH], [Path to edje_cc binary]),
AM_CONDITIONAL(ENABLE_IBUS, test "x$enable_ibus" = "xyes")
if test "x$enable_ibus" = "xyes"; then
- PKG_CHECK_MODULES(ELDBUS, [eldbus])
+ PKG_CHECK_MODULES(IBUS, [eldbus eet efreet])
AC_CHECK_PROG([have_ibus], [ibus], [yes], [no])
AS_IF([ test "x$have ibus" = "xno" ],
AM_CFLAGS= \
@WAYLAND_CFLAGS@ \
@EFL_CFLAGS@ \
- @ELDBUS_CFLAGS@ \
+ @IBUS_CFLAGS@ \
-DPKGDATADIR='"$(pkgdatadir)"'
AM_LDFLAGS= \
@WAYLAND_LIBS@ \
@EFL_LIBS@ \
- @ELDBUS_LIBS@
+ @IBUS_LIBS@
weekeyboard_SOURCES= \
wkb-main.c \
Eldbus_Service_Interface *
wkb_ibus_config_register(Eldbus_Connection *conn)
{
- Eldbus_Service_Interface *ret = eldbus_service_interface_register(conn, IBUS_PATH_CONFIG, &_wkb_ibus_config_interface);
+ Eldbus_Service_Interface *ret = NULL;
+ const char *path;
- if (!ret)
+ if (_conf_eet)
{
- ERR("Unable to register IBusConfig interface\n");
+ WRN("wkb_config_eet already created\n");
goto end;
}
- if (_conf_eet)
+ if (!(ret = eldbus_service_interface_register(conn, IBUS_PATH_CONFIG, &_wkb_ibus_config_interface)))
{
- WRN("wkb_config_eet already created\n");
+ ERR("Unable to register IBusConfig interface\n");
goto end;
}
- _conf_eet = wkb_ibus_config_eet_new("/home/edebarro/projects/wayland/weekeyboard/ibus-cfg.eet", ret);
+ path = eina_stringshare_printf("%s/wkb-ibus-cfg.eet", efreet_config_home_get());
+ _conf_eet = wkb_ibus_config_eet_new(path, ret);
+ eina_stringshare_del(path);
if (!_conf_eet)
{
#include <Eet.h>
#include <Ecore.h>
#include <Eldbus.h>
+#include <Efreet.h>
static void
_finish(int foo)
goto eldbus_err;
}
+ if (!efreet_init())
+ {
+ printf("Error initializing efreet");
+ ret = 1;
+ goto efreet_err;
+ }
+
if (!wkb_ibus_init())
{
printf("Error initializing ibus");
ecore_main_loop_begin();
end:
+ efreet_shutdown();
+
+efreet_err:
eldbus_shutdown();
eldbus_err: