AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

Closes #3765

See merge request GNOME/gtk!3311
This commit is contained in:
Matthias Clasen 2021-03-18 00:31:10 +00:00
commit 2ce92085e1
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/gtklabel.c
View File

@ -1658,6 +1658,7 @@ gtk_label_query_tooltip (GtkWidget *widget,
if (link->title)
{
gtk_tooltip_set_markup (tooltip, link->title);
return TRUE;
}
}
}

10
modules/media/gtkgstpaintable.c
View File

@ -192,20 +192,10 @@ gtk_gst_paintable_realize (GtkGstPaintable *self,
GdkSurface *surface)
{
GError *error = NULL;
GtkNative *native;
GskRenderer *renderer;
if (self->context)
return;
native = gtk_native_get_for_surface (surface);
renderer = gtk_native_get_renderer (native);
if (!GSK_IS_GL_RENDERER (renderer))
{
GST_INFO ("not using GL with a %s renderer\n", G_OBJECT_TYPE_NAME (renderer));
return;
}
self->context = gdk_surface_create_gl_context (surface, &error);
if (self->context == NULL)
{