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

Merge branch 'pre.c99' into 'gtk-3-24'

Browse Source 
gtkimcontextsimple.c, updateiconcache.c: Fix build on older compilers

See merge request GNOME/gtk!3444
This commit is contained in:
Matthias Clasen 2021-04-16 12:12:56 +00:00
commit a0a18a7b02
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkimcontextsimple.c
View File

@ -553,8 +553,10 @@ no_sequence_matches (GtkIMContextSimple *context_simple,
if (i == n_compose - 1)
{
int j;
/* dead keys are never *really* dead */
for (int j = 0; j < i; j++)
for (j = 0; j < i; j++)
{
ch = dead_key_to_unicode (priv->compose_buffer[j], &need_space);
if (ch)

3
gtk/updateiconcache.c
View File

@ -623,14 +623,13 @@ scan_directory (const gchar *base_path,
list = g_list_sort (list, (GCompareFunc) strcmp);
for (iterator = list; iterator; iterator = iterator->next)
{
name = iterator->data;
gchar *path;
gboolean retval;
int flags = 0;
Image *image;
gchar *basename, *dot;
name = iterator->data;
path = g_build_filename (dir_path, name, NULL);
retval = g_file_test (path, G_FILE_TEST_IS_DIR);