From 9abd33133650d77714fccf09d0c9ff27c9b75a78 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 5 Jul 2012 22:39:08 +0100 Subject: Drop GTK+ 2.20 support. Fixed bugs: - https://launchpad.net/bugs/1020494 (bzr r11529) --- src/ui/tool/event-utils.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/ui/tool/event-utils.cpp') diff --git a/src/ui/tool/event-utils.cpp b/src/ui/tool/event-utils.cpp index 6b067a3ce..c3b69d79d 100644 --- a/src/ui/tool/event-utils.cpp +++ b/src/ui/tool/event-utils.cpp @@ -14,10 +14,6 @@ #include "display/sp-canvas.h" #include "ui/tool/event-utils.h" -#if !GTK_CHECK_VERSION(2,22,0) -#include "compat-key-syms.h" -#endif - namespace Inkscape { namespace UI { @@ -80,11 +76,7 @@ unsigned combine_motion_events(SPCanvas *canvas, GdkEventMotion &event, gint mas event.x_root = next.x_root; event.y_root = next.y_root; if (event.axes && next.axes) { -#if GTK_CHECK_VERSION(2,22,0) memcpy(event.axes, next.axes, gdk_device_get_n_axes(event.device)); -#else - memcpy(event.axes, next.axes, event.device->num_axes); -#endif } } -- cgit v1.2.3 From dd870f605bac1a4c16611969ea8e57021b99887b Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Fri, 13 Jul 2012 00:10:43 +0200 Subject: Bug #781893 (Crash after moving a Bezier node after Knot path effect) Although issue not solved, prevent Inkscape from crashing. Add some code to make code more robust. (bzr r11547) --- src/ui/tool/event-utils.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/ui/tool/event-utils.cpp') diff --git a/src/ui/tool/event-utils.cpp b/src/ui/tool/event-utils.cpp index c3b69d79d..079275d63 100644 --- a/src/ui/tool/event-utils.cpp +++ b/src/ui/tool/event-utils.cpp @@ -55,6 +55,9 @@ unsigned combine_key_events(guint keyval, gint mask) unsigned combine_motion_events(SPCanvas *canvas, GdkEventMotion &event, gint mask) { + if (canvas == NULL) { + return false; + } GdkEvent *event_next; gint i = 0; event.x -= canvas->x0; @@ -62,7 +65,7 @@ unsigned combine_motion_events(SPCanvas *canvas, GdkEventMotion &event, gint mas event_next = gdk_event_get(); // while the next event is also a motion notify - while (event_next && event_next->type == GDK_MOTION_NOTIFY + while (event_next && (event_next->type == GDK_MOTION_NOTIFY) && (!mask || event_next->motion.state & mask)) { if (event_next->motion.device == event.device) { @@ -86,8 +89,9 @@ unsigned combine_motion_events(SPCanvas *canvas, GdkEventMotion &event, gint mas i++; } // otherwise, put it back onto the queue - if (event_next) + if (event_next) { gdk_event_put(event_next); + } event.x += canvas->x0; event.y += canvas->y0; -- cgit v1.2.3