Description: Fix misleading indentation to fix build with gcc-6 Author: Sean Whitton Bug-Debian: https://bugs.debian.org/811933 Forwarded: https://bugs.launchpad.net/geis/+bug/1608086 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/libgeis/geis_subscription.c +++ b/libgeis/geis_subscription.c @@ -238,8 +238,10 @@ geis_subscription_bag_empty(GeisSubBag b for (i = 0; i < bag->sub_store_size; ++i) { if (bag->sub_store[i]) + { _subscription_unref(bag->sub_store[i]); bag->sub_store[i] = NULL; + } } } From: Khem Raj Date: Mon, 24 Apr 2017 12:34:55 -0700 X-Dgit-Generated: 2.2.17-1.2 32cf7d865222f63ba5da5f79d340acf895ff9379 Subject: libgeis: Compare the first character of string to null gcc7 wants to be specific when it comes to comparing characters and strings fixes | ../../../../../../../workspace/sources/geis/libgeis/geis_v1.c: In function '_v1_subscribe_device': | ../../../../../../../workspace/sources/geis/libgeis/geis_v1.c:613:20: error: comparison between pointer and zero character constant [-Werror=pointer-compare] Signed-off-by: Khem Raj Bug-Debian: https://bugs.debian.org/853415 --- --- geis-2.2.17.orig/libgeis/geis_v1.c +++ geis-2.2.17/libgeis/geis_v1.c @@ -610,7 +610,7 @@ _v1_subscribe_device(GeisInstance instan const char **gesture_list) { GeisStatus result = GEIS_UNKNOWN_ERROR; - if (gesture_list == GEIS_ALL_GESTURES) + if (gesture_list[0][0] == GEIS_ALL_GESTURES) { geis_debug("subscribing device %d for all gestures", device_id); } @@ -757,7 +757,7 @@ geis_unsubscribe(GeisInstance instan GeisGestureType *gesture_list) { GeisStatus status = GEIS_STATUS_NOT_SUPPORTED; - if (gesture_list == GEIS_ALL_GESTURES) + if (gesture_list[0] == GEIS_ALL_GESTURES) { status = geis_subscription_deactivate(instance->subscription); }