Fix a problem in build script of memconf

This commit is contained in:
Peng Huang 2010-07-23 15:25:45 +08:00
Родитель 810037e12a
Коммит d400b92229
2 изменённых файлов: 17 добавлений и 5 удалений

Просмотреть файл

@ -34,7 +34,7 @@ GCONF_DIRS = \
endif
if ENABLE_MEMCONF
MEM_CONF = \
MEMCONF_DIRS = \
memconf \
$(NULL)
endif
@ -52,7 +52,7 @@ SUBDIRS = \
bindings \
$(PYTHON_DIRS) \
$(GCONF_DIRS) \
$(MEM_DIRS) \
$(MEMCONF_DIRS) \
$(NULL)
ACLOCAL_AMFLAGS = -I m4
@ -134,6 +134,18 @@ ppa: dist debian/changelog
debuild -S -sa ; \
)
dpkg: dist debian/changelog
$(AM_V_GEN) \
( \
mkdir ppa; \
cd ppa; \
tar zxvf ../$(distdir).tar.gz ; \
cd $(distdir); \
cp -a ../../debian . ; \
cd debian; \
debuild -b ; \
)
clean-rpm:
$(RM) -r "`uname -i`"

Просмотреть файл

@ -145,7 +145,7 @@ static gboolean ibus_config_memconf_set_value(IBusConfigService* config,
g_value_unset(new_entry);
g_free(new_entry);
*error = ibus_error_new_from_printf(
DBUS_ERROR_FAILED, "Can not set value [%s->%s]", section, name);
"org.freedesktop.DBus.Error.Failed", "Can not set value [%s->%s]", section, name);
}
// Let ibus-daemon know that a new value is set to ibus-memconf. Note that
@ -174,7 +174,7 @@ static gboolean ibus_config_memconf_get_value(IBusConfigService* config,
= memconf->entries->find(key);
if (iter == memconf->entries->end()) {
*error = ibus_error_new_from_printf(
DBUS_ERROR_FAILED, "Can not get value [%s->%s]", section, name);
"org.freedesktop.DBus.Error.Failed", "Can not get value [%s->%s]", section, name);
return FALSE;
}
@ -202,7 +202,7 @@ static gboolean ibus_config_memconf_unset(IBusConfigService* config,
if (!do_unset(memconf, key)) {
*error = ibus_error_new_from_printf(
DBUS_ERROR_FAILED, "Can not unset value [%s->%s]", section, name);
"org.freedesktop.DBus.Error.Failed", "Can not unset value [%s->%s]", section, name);
return FALSE;
}