summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2014-06-25 10:32:42 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2014-06-25 10:32:42 +1000
commitbad56cac5b17c3eda58facfc87ae6345814ddc16 (patch)
treea375bfb5e5a42bf40d5b3d9a967c3b09d940158d /tools
parent97a6bf10f95859940379787da2635b69399db40c (diff)
parent89aa3ca176130104f2fc5c034400cbb4c41cf479 (diff)
downloadlibinput-bad56cac5b17c3eda58facfc87ae6345814ddc16.tar.gz
Merge branch 'ref-counting-context'
Conflicts: src/udev-seat.c test/log.c
Diffstat (limited to 'tools')
-rw-r--r--tools/event-debug.c6
-rw-r--r--tools/event-gui.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/event-debug.c b/tools/event-debug.c
index 824c6b20..3eade366 100644
--- a/tools/event-debug.c
+++ b/tools/event-debug.c
@@ -162,7 +162,7 @@ open_udev(struct libinput **li)
if (libinput_udev_assign_seat(*li, seat)) {
fprintf(stderr, "Failed to set seat\n");
- libinput_destroy(*li);
+ libinput_unref(*li);
return 1;
}
@@ -188,7 +188,7 @@ open_device(struct libinput **li, const char *path)
device = libinput_path_add_device(*li, path);
if (!device) {
fprintf(stderr, "Failed to initialized device %s\n", path);
- libinput_destroy(*li);
+ libinput_unref(*li);
return 1;
}
@@ -489,7 +489,7 @@ main(int argc, char **argv)
mainloop(li);
- libinput_destroy(li);
+ libinput_unref(li);
if (udev)
udev_unref(udev);
diff --git a/tools/event-gui.c b/tools/event-gui.c
index df86a520..9475e778 100644
--- a/tools/event-gui.c
+++ b/tools/event-gui.c
@@ -467,7 +467,7 @@ main(int argc, char *argv[])
gtk_main();
- libinput_destroy(li);
+ libinput_unref(li);
udev_unref(udev);
return 0;