diff options
| author | Sean Davis <smd.seandavis@gmail.com> | 2015-02-26 06:50:22 -0500 |
|---|---|---|
| committer | Sean Davis <smd.seandavis@gmail.com> | 2015-02-26 06:50:22 -0500 |
| commit | 500f6937ae707c611db246bb2c7c4b05cccb92c9 (patch) | |
| tree | 32e8c465d456426e677695b38c78044d757f48dc | |
| parent | 1eb80e3071b03cf2e6fee0fb26b8fc5f9a9ddc1d (diff) | |
| download | xfce4-settings-500f6937ae707c611db246bb2c7c4b05cccb92c9.tar.gz | |
Fix the second crash inBug #11568
| -rw-r--r-- | dialogs/appearance-settings/main.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/dialogs/appearance-settings/main.c b/dialogs/appearance-settings/main.c index cbbb841..3eeb348 100644 --- a/dialogs/appearance-settings/main.c +++ b/dialogs/appearance-settings/main.c @@ -664,7 +664,6 @@ appearance_settings_load_icon_themes (preview_data *pd) GtkIconTheme *icon_theme; GdkPixbuf *preview; GdkPixbuf *icon; - GError *error = NULL; gchar* preview_icons[4] = { "folder", "go-down", "audio-volume-high", "web-browser" }; int coords[4][2] = { { 4, 4 }, { 24, 4 }, { 4, 24 }, { 24, 24 } }; @@ -722,17 +721,11 @@ appearance_settings_load_icon_themes (preview_data *pd) for (p = 0; p < 4; p++) { if (gtk_icon_theme_has_icon (icon_theme, preview_icons[p])) - icon = gtk_icon_theme_load_icon (icon_theme, preview_icons[p], 16, 0, &error); + icon = gtk_icon_theme_load_icon (icon_theme, preview_icons[p], 16, 0, NULL); else if (gtk_icon_theme_has_icon (icon_theme, "image-missing")) - icon = gtk_icon_theme_load_icon (icon_theme, "image-missing", 16, 0, &error); + icon = gtk_icon_theme_load_icon (icon_theme, "image-missing", 16, 0, NULL); - if (!icon) - { - g_warning ("Couldn't load icon: %s", error->message); - g_error_free (error); - error = NULL; - } - else + if (icon) { gdk_pixbuf_copy_area (icon, 0, 0, 16, 16, preview, coords[p][0], coords[p][1]); g_object_unref (icon); |