summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
Diffstat (limited to 'capplets')
-rw-r--r--capplets/default-applications/mate-da-capplet.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c
index de7c36bd..42813b3b 100644
--- a/capplets/default-applications/mate-da-capplet.c
+++ b/capplets/default-applications/mate-da-capplet.c
@@ -302,7 +302,8 @@ refresh_combo_box_icons(GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_
ICONAME_COL, &icon_name,
-1);
- pixbuf = gtk_icon_theme_load_icon(theme, icon_name, 22, 0, NULL);
+ GtkIconInfo* icon_info = gtk_icon_theme_lookup_icon (theme, icon_name, 22, GTK_ICON_LOOKUP_FORCE_SIZE);
+ pixbuf = gtk_icon_info_load_icon(icon_info, NULL);
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
PIXBUF_COL, pixbuf,
@@ -330,7 +331,7 @@ static struct {
{"mobility_image", "preferences-desktop-accessibility"},
{"messenger_image", "user-idle"},
{"filemanager_image", "file-manager"},
- {"imageviewer_image", "image-x-generic"},
+ {"imageviewer_image", "eom"},
{"video_image", "video-x-generic"},
{"text_image", "text-editor"},
{"terminal_image", "terminal"},
@@ -351,7 +352,8 @@ theme_changed_cb(GtkIconTheme* theme, MateDACapplet* capplet)
{
icon = gtk_builder_get_object(capplet->builder, icons[i].name);
- GdkPixbuf* pixbuf = gtk_icon_theme_load_icon(theme, icons[i].icon, 32, 0, NULL);
+ GtkIconInfo* icon_info = gtk_icon_theme_lookup_icon (theme, icons[i].icon, 32, GTK_ICON_LOOKUP_FORCE_SIZE);
+ GdkPixbuf* pixbuf = gtk_icon_info_load_icon(icon_info, NULL);
gtk_image_set_from_pixbuf(GTK_IMAGE(icon), pixbuf);
@@ -482,7 +484,7 @@ fill_combo_box(GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_list, gch
renderer = gtk_cell_renderer_pixbuf_new();
/* Not all cells have a pixbuf, this prevents the combo box to shrink */
- gtk_cell_renderer_set_fixed_size(renderer, -1, 22);
+ gtk_cell_renderer_set_fixed_size(renderer, 22, 22);
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_box), renderer, FALSE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), renderer,
"pixbuf", PIXBUF_COL,
@@ -513,7 +515,8 @@ fill_combo_box(GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_list, gch
icon_name = g_strdup ("binary");
}
- pixbuf = gtk_icon_theme_load_icon(theme, icon_name, 22, 0, NULL);
+ GtkIconInfo* icon_info = gtk_icon_theme_lookup_icon (theme, icon_name, 22, GTK_ICON_LOOKUP_FORCE_SIZE);
+ pixbuf = gtk_icon_info_load_icon(icon_info, NULL);
gtk_list_store_append(GTK_LIST_STORE(model), &iter);
gtk_list_store_set(GTK_LIST_STORE(model), &iter,