Patch 8.2.1645

5 views
Skip to first unread message

Bram Moolenaar

unread,
Sep 9, 2020, 1:06:46 PM9/9/20
to vim...@googlegroups.com

Patch 8.2.1645
Problem: GTK3: icons become broken images when resized.
Solution: Use gtk_image_new_from_icon_name(). (closes #6916)
Fix compiler warnings.
Files: src/gui_gtk_x11.c


*** ../vim-8.2.1644/src/gui_gtk_x11.c 2020-08-01 13:10:04.582539553 +0200
--- src/gui_gtk_x11.c 2020-09-09 19:02:37.124675147 +0200
***************
*** 2555,2561 ****

gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons);

! g_list_foreach(icons, (GFunc)&g_object_unref, NULL);
g_list_free(icons);
}

--- 2555,2562 ----

gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons);

! // TODO: is this type cast OK?
! g_list_foreach(icons, (GFunc)(void *)&g_object_unref, NULL);
g_list_free(icons);
}

***************
*** 3092,3099 ****
const gchar *icon_name;

gtk_image_get_icon_name(image, &icon_name, NULL);
!
! gtk_image_set_from_icon_name(image, icon_name, icon_size);
}
# else
// User-defined icons are stored in a GtkIconSet
--- 3093,3100 ----
const gchar *icon_name;

gtk_image_get_icon_name(image, &icon_name, NULL);
! image = (GtkImage *)gtk_image_new_from_icon_name(
! icon_name, icon_size);
}
# else
// User-defined icons are stored in a GtkIconSet
***************
*** 4967,4973 ****
}
}

! g_list_foreach(item_list, (GFunc)&pango_item_free, NULL);
g_list_free(item_list);
pango_attr_list_unref(attr_list);
}
--- 4968,4975 ----
}
}

! // TODO: is this type cast OK?
! g_list_foreach(item_list, (GFunc)(void *)&pango_item_free, NULL);
g_list_free(item_list);
pango_attr_list_unref(attr_list);
}
*** ../vim-8.2.1644/src/version.c 2020-09-09 18:54:39.170253618 +0200
--- src/version.c 2020-09-09 19:04:55.388229847 +0200
***************
*** 756,757 ****
--- 756,759 ----
{ /* Add new patch number below this line */
+ /**/
+ 1645,
/**/

--
Compilation process failed successfully.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages