Add GISI_* build variables; remove unnecessary curly brackets

diff --git a/configure.ac b/configure.ac
index 92fb82f..2d16fae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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}])

diff --git a/gisi/client.c b/gisi/client.c
index 5fc8149..281f817 100644 (file)
--- a/gisi/client.c
+++ b/gisi/client.c
@@ -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));