Repackaged to utouch-grail v1.0.8v1.0.8

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

6 files changed, 16 insertions, 23 deletions

diff --git a/Makefile.am b/Makefile.am
index 14279f4..ec27340 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = src test
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = grail.pc
+pkgconfig_DATA = utouch-grail.pc
 
 INCLUDES = $(top_srcdir)/include/
 
diff --git a/configure.ac b/configure.ac
index f883801..627360e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([Gesture Recognition And Instantiation Library],
-        [1.0.7],
+        [1.0.8],
         [],
-        [grail])
+        [utouch-grail])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([config-aux])
@@ -27,5 +27,5 @@ PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.0])
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  test/Makefile
-                 grail.pc])
+                 utouch-grail.pc])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 96ac7ed..3171edd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
-lib_LTLIBRARIES = libgrail.la
+lib_LTLIBRARIES = libutouch-grail.la
 
-libgrail_la_LDFLAGS = \
+libutouch_grail_la_LDFLAGS = \
         -version-info @LIB_VERSION@ \
         -lm \
         $(MTDEV_LIBS)
 
-libgrail_la_SOURCES = \
+libutouch_grail_la_SOURCES = \
         evbuf.h \
         gebuf.h \
         touch-dev.c \
@@ -27,8 +27,8 @@ AM_CFLAGS = $(CWARNFLAGS)
 
 INCLUDES = -I$(top_srcdir)/include/
 
-libgrailincludedir = $(includedir)
-libgrailinclude_HEADERS = \
+libutouch_grailincludedir = $(includedir)
+libutouch_grailinclude_HEADERS = \
         $(top_srcdir)/include/grail-bits.h \
         $(top_srcdir)/include/grail-types.h \
         $(top_srcdir)/include/grail-touch.h \
diff --git a/src/grail-api.c b/src/grail-api.c
index 03355dc..7c054a9 100644
--- a/src/grail-api.c
+++ b/src/grail-api.c
@@ -82,17 +82,10 @@ static void tp_sync(struct touch_engine *engine,
                 evbuf_clear(&x->evbuf);
                 return;
         }
-        if (hack > x->hack_status) {
-                ev = *syn;
-                ev.type = EV_KEY;
-                ev.code = BTN_TOUCH;
-                ev.value = hack;
-                ge->event(ge, &ev);
-                x->hack_status = hack;
-                nevent++;
-        }
         while (!evbuf_empty(&x->evbuf)) {
                 evbuf_get(&x->evbuf, &ev);
+                if (!hack && ev.type == EV_ABS)
+                        continue;
                 if (dofilt && grail_mask_get(filtered, ev.type))
                         continue;
                 if (extra_filtered(&ev))
@@ -100,7 +93,7 @@ static void tp_sync(struct touch_engine *engine,
                 ge->event(ge, &ev);
                 nevent++;
         }
-        if (hack < x->hack_status) {
+        if (hack != x->hack_status) {
                 ev = *syn;
                 ev.type = EV_KEY;
                 ev.code = BTN_TOUCH;
diff --git a/test/Makefile.am b/test/Makefile.am
index 4ccbe0a..8ffbe09 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = grail-touch grail-gesture
 INCLUDES=-I$(top_srcdir)/include/
 
 grail_touch_SOURCES = grail-touch.c
-grail_touch_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev -lm
+grail_touch_LDFLAGS = -L$(top_builddir)/src/.libs/ -lutouch-grail -lmtdev -lm
 
 grail_gesture_SOURCES = grail-gesture.c
-grail_gesture_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev -lm
+grail_gesture_LDFLAGS = -L$(top_builddir)/src/.libs/ -lutouch-grail -lmtdev -lm
diff --git a/grail.pc.in b/utouch-grail.pc.in
index 6d69ddc..4b06dc9 100644
--- a/grail.pc.in
+++ b/utouch-grail.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: grail
+Name: utouch-grail
 Description: Gesture Recognition And Instantiation Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lgrail
+Libs: -L${libdir} -lutouch-grail