diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 890dbf01a1..37def3897e 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -612,7 +612,6 @@ gdk_event_queue_handle_scroll_compression (GdkDisplay *display) GList *l; GdkSurface *surface = NULL; GdkDevice *device = NULL; - GdkEvent *last_event = NULL; GList *scrolls = NULL; GArray *history = NULL; GdkScrollUnit scroll_unit = GDK_SCROLL_UNIT_WHEEL; @@ -645,9 +644,6 @@ gdk_event_queue_handle_scroll_compression (GdkDisplay *display) scroll_unit != scroll_event->unit) break; - if (!last_event) - last_event = event; - surface = event->surface; device = event->device; scroll_unit = scroll_event->unit; diff --git a/gtk/gtkalertdialog.h b/gtk/gtkalertdialog.h index 5d5d9f01b7..4263eb9c92 100644 --- a/gtk/gtkalertdialog.h +++ b/gtk/gtkalertdialog.h @@ -33,8 +33,8 @@ GDK_AVAILABLE_IN_4_10 G_DECLARE_FINAL_TYPE (GtkAlertDialog, gtk_alert_dialog, GTK, ALERT_DIALOG, GObject) GDK_AVAILABLE_IN_4_10 -GtkAlertDialog *gtk_alert_dialog_new (const char *format, - ...) G_GNUC_PRINTF (1, 2); +GtkAlertDialog *gtk_alert_dialog_new (const char *format, + ...) G_GNUC_PRINTF (1, 2); GDK_AVAILABLE_IN_4_10 gboolean gtk_alert_dialog_get_modal (GtkAlertDialog *self); diff --git a/gtk/inspector/recorder.c b/gtk/inspector/recorder.c index e0920365ca..8d960411d6 100644 --- a/gtk/inspector/recorder.c +++ b/gtk/inspector/recorder.c @@ -1443,9 +1443,12 @@ event_type_name (GdkEventType type) "Pad Button Release", "Pad Rind", "Pad Strip", - "Pad Group Mode" + "Pad Group Mode", + "Touchpad Hold", }; + G_STATIC_ASSERT (G_N_ELEMENTS (event_name) == GDK_EVENT_LAST); + return event_name[type]; }