thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1645: GTK3: icons become broken images when resized

Browse Source 
Problem:    GTK3: icons become broken images when resized.
Solution:   Use gtk_image_new_from_icon_name(). (closes #6916)
            Fix compiler warnings.
This commit is contained in:
Bram Moolenaar
2020-09-09 19:05:13 +02:00
parent ba7c0d7b4c
commit 81a4cf469a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui_gtk_x11.c
View File

@@ -2555,7 +2555,8 @@ mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons); gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons);
g_list_foreach(icons, (GFunc)&g_object_unref, NULL); // TODO: is this type cast OK?
g_list_foreach(icons, (GFunc)(void *)&g_object_unref, NULL);
g_list_free(icons); g_list_free(icons);
} }
@@ -3092,8 +3093,8 @@ icon_size_changed_foreach(GtkWidget *widget, gpointer user_data)
const gchar *icon_name; const gchar *icon_name;
gtk_image_get_icon_name(image, &icon_name, NULL); gtk_image_get_icon_name(image, &icon_name, NULL);
image = (GtkImage *)gtk_image_new_from_icon_name(
gtk_image_set_from_icon_name(image, icon_name, icon_size); icon_name, icon_size);
} }
# else # else
// User-defined icons are stored in a GtkIconSet // User-defined icons are stored in a GtkIconSet
@@ -4967,7 +4968,8 @@ ascii_glyph_table_init(void)
} }
} }
g_list_foreach(item_list, (GFunc)&pango_item_free, NULL); // TODO: is this type cast OK?
g_list_foreach(item_list, (GFunc)(void *)&pango_item_free, NULL);
g_list_free(item_list); g_list_free(item_list);
pango_attr_list_unref(attr_list); pango_attr_list_unref(attr_list);
} }

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1645,
/**/ /**/
1644, 1644,
/**/ /**/