Add GISI_* build variables; remove unnecessary curly brackets

This commit is contained in:
Aki Niemi 2009-06-22 21:40:49 +03:00
parent 369f8d0c84
commit 94f1fce8ee
2 changed files with 4 additions and 2 deletions

View File

@ -78,6 +78,9 @@ AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)'])
AC_SUBST([GATCHAT_CFLAGS], ['-I$(top_srcdir)/gatchat'])
AC_SUBST([GATCHAT_LIBS], ['$(top_builddir)/gatchat/libgatchat.la'])
AC_SUBST([GISI_CFLAGS], ['-I$(top_srcdir)/gisi'])
AC_SUBST([GISI_LIBS], ['$(top_builddir)/gisi/libgisi.la'])
AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
[don't install configuration and data files]),
[enable_datafiles=${enableval}])

View File

@ -364,9 +364,8 @@ static gboolean g_isi_callback(GIOChannel *channel, GIOCondition cond,
} else {
/* Transaction ID at offset 0 */
id = msg[0];
if (cl->func[id] == NULL) {
if (cl->func[id] == NULL)
return TRUE; /* Bad transaction ID */
}
if ((cl->func[id])(cl, msg + 1, len - 1, obj,
cl->data[id]))
g_isi_request_cancel(g_isi_req(cl, id));