Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Matthiasc/for main

See merge request GNOME/gtk!5467
This commit is contained in:
Matthias Clasen
2023-02-02 17:36:44 +00:00
parent 8911ed5d9b cabd18fba0
commit 2a1e4b8621
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gsk/gl/gskglcommandqueue.c
View File

@@ -956,7 +956,7 @@ gsk_gl_command_queue_execute (GskGLCommandQueue *self,
guint default_framebuffer)
{
G_GNUC_UNUSED guint count = 0;
graphene_rect_t scissor_test = { 0, };
graphene_rect_t scissor_test = GRAPHENE_RECT_INIT (0, 0, 0, 0);
gboolean has_scissor = scissor != NULL;
gboolean scissor_state = -1;
guint program = 0;

5
gtk/gtktextbtree.c
View File

@@ -2415,7 +2415,6 @@ _gtk_text_btree_get_text (const GtkTextIter *start_orig,
GtkTextLineSegment *seg;
GtkTextLineSegment *end_seg;
GString *retval;
char *str;
GtkTextIter iter;
GtkTextIter start;
GtkTextIter end;
@@ -2447,9 +2446,7 @@ _gtk_text_btree_get_text (const GtkTextIter *start_orig,
copy_segment (retval, include_hidden, include_nonchars, &iter, &end);
str = retval->str;
g_string_free (retval, FALSE);
return str;
return g_string_free (retval, FALSE);
}
int