From 3bd070a5580f2d6d678c266af88b7dc0b816f4db Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Tue, 14 Mar 2017 14:21:14 +0000 Subject: ev-view: explicitly require a GtkScrolledWindow as the parent widget This is implicitly needed in a few places in code, so make the requirement explicit on ::parent-set. Upstream commit by garnacho on 11 Aug 2014: https://github.com/GNOME/evince/commit/6288e48 --- libview/ev-view.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libview/ev-view.c b/libview/ev-view.c index 77851234..4bd3b23c 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -4756,6 +4756,16 @@ ev_view_forall (GtkContainer *container, } } +static void +ev_view_parent_set (GtkWidget *widget, + GtkWidget *previous_parent) +{ + GtkWidget *parent; + + parent = gtk_widget_get_parent (widget); + g_assert (!parent || GTK_IS_SCROLLED_WINDOW (parent)); +} + static void ev_view_class_init (EvViewClass *class) { @@ -4788,6 +4798,7 @@ ev_view_class_init (EvViewClass *class) widget_class->drag_motion = ev_view_drag_motion; widget_class->popup_menu = ev_view_popup_menu; widget_class->query_tooltip = ev_view_query_tooltip; + widget_class->parent_set = ev_view_parent_set; object_class->dispose = ev_view_dispose; -- cgit v1.2.1