Gtk+-3.10: don't use deprecated gtk_icon_size_lookup_for_settings
This commit is contained in:
parent
f2c09bf972
commit
4e64ecb701
|
@ -30,8 +30,12 @@ pluma_close_button_style_set (GtkWidget *button,
|
||||||
{
|
{
|
||||||
gint h, w;
|
gint h, w;
|
||||||
|
|
||||||
|
#if GTK_CHECK_VERSION (3, 10, 0)
|
||||||
|
gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
|
||||||
|
#else
|
||||||
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button),
|
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button),
|
||||||
GTK_ICON_SIZE_MENU, &w, &h);
|
GTK_ICON_SIZE_MENU, &w, &h);
|
||||||
|
#endif
|
||||||
|
|
||||||
gtk_widget_set_size_request (button, w + 2, h + 2);
|
gtk_widget_set_size_request (button, w + 2, h + 2);
|
||||||
|
|
||||||
|
|
|
@ -1868,10 +1868,14 @@ _pluma_tab_get_icon (PlumaTab *tab)
|
||||||
theme = gtk_icon_theme_get_for_screen (screen);
|
theme = gtk_icon_theme_get_for_screen (screen);
|
||||||
g_return_val_if_fail (theme != NULL, NULL);
|
g_return_val_if_fail (theme != NULL, NULL);
|
||||||
|
|
||||||
|
#if GTK_CHECK_VERSION (3, 10, 0)
|
||||||
|
gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, NULL, &icon_size);
|
||||||
|
#else
|
||||||
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (tab)),
|
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (tab)),
|
||||||
GTK_ICON_SIZE_MENU,
|
GTK_ICON_SIZE_MENU,
|
||||||
NULL,
|
NULL,
|
||||||
&icon_size);
|
&icon_size);
|
||||||
|
#endif
|
||||||
|
|
||||||
switch (tab->priv->state)
|
switch (tab->priv->state)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue