Date: Thu, 31 Dec 2015 17:37:16 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404953 - in head/x11-toolkits/gtk30: . files Message-ID: <201512311737.tBVHbGAg085450@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Thu Dec 31 17:37:15 2015 New Revision: 404953 URL: https://svnweb.freebsd.org/changeset/ports/404953 Log: Backport a patch to fix pasting a non web (epiphany) copied url into the web adressbar. Submitted by: Graham Perrin <grahamperrin@gmail.com> Obtained from: gtk+ upstream Added: head/x11-toolkits/gtk30/files/patch-gtk_gtkentrycompletion.c (contents, props changed) Modified: head/x11-toolkits/gtk30/Makefile Modified: head/x11-toolkits/gtk30/Makefile ============================================================================== --- head/x11-toolkits/gtk30/Makefile Thu Dec 31 16:05:57 2015 (r404952) +++ head/x11-toolkits/gtk30/Makefile Thu Dec 31 17:37:15 2015 (r404953) @@ -5,7 +5,7 @@ PORTNAME= gtk PORTVERSION= 3.16.7 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 Added: head/x11-toolkits/gtk30/files/patch-gtk_gtkentrycompletion.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtk30/files/patch-gtk_gtkentrycompletion.c Thu Dec 31 17:37:15 2015 (r404953) @@ -0,0 +1,50 @@ + +https://git.gnome.org/browse/gtk+/commit/?id=0731c502626d2b739281f7bb87f5cfd9d8a61ade + +From 0731c502626d2b739281f7bb87f5cfd9d8a61ade Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Thu, 15 Oct 2015 20:16:54 -0400 +Subject: entry completion: Only grab the device if we have one + +When the entry completion is popped up from a timeout, we may +not have a device. In that case, don't call gdk_device_grab, +do avoid criticals. +--- + gtk/gtkentrycompletion.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c +index cee8f25..9acae9d 100644 +--- gtk/gtkentrycompletion.c ++++ gtk/gtkentrycompletion.c +@@ -1654,15 +1654,18 @@ gtk_entry_completion_popup (GtkEntryCompletion *completion) + + gtk_widget_show (completion->priv->popup_window); + +- gtk_device_grab_add (completion->priv->popup_window, completion->priv->device, TRUE); +- gdk_device_grab (completion->priv->device, gtk_widget_get_window (completion->priv->popup_window), +- GDK_OWNERSHIP_WINDOW, TRUE, +- GDK_BUTTON_PRESS_MASK | +- GDK_BUTTON_RELEASE_MASK | +- GDK_POINTER_MOTION_MASK, +- NULL, GDK_CURRENT_TIME); +- +- completion->priv->has_grab = TRUE; ++ if (completion->priv->device) ++ { ++ gtk_device_grab_add (completion->priv->popup_window, completion->priv->device, TRUE); ++ gdk_device_grab (completion->priv->device, gtk_widget_get_window (completion->priv->popup_window), ++ GDK_OWNERSHIP_WINDOW, TRUE, ++ GDK_BUTTON_PRESS_MASK | ++ GDK_BUTTON_RELEASE_MASK | ++ GDK_POINTER_MOTION_MASK, ++ NULL, GDK_CURRENT_TIME); ++ ++ completion->priv->has_grab = TRUE; ++ } + } + + void +-- +cgit v0.11.2 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512311737.tBVHbGAg085450>