# HG changeset patch
# User chainsaw
# Date 1140300177 28800
# Node ID 9d2c175e458e79ea8c8c12679862c02010cfc013
# Parent 72ec4db929ed5d99741616981da535c2f9cc0851
[svn] More skin-related fixups. One segfault fix by Michael Hanselmann and a fix by Daniel Drake to also display skins that lack a thumbnail.
diff -r 72ec4db929ed -r 9d2c175e458e audacious/skin.c
--- a/audacious/skin.c Sat Feb 18 13:21:21 2006 -0800
+++ b/audacious/skin.c Sat Feb 18 14:02:57 2006 -0800
@@ -330,7 +330,7 @@
memset(&basenames, 0, sizeof(basenames));
- for (i = 0, y = 0; ext_targets[i]; i++, y++)
+ for (i = 0, y = 0; i < EXTENSION_TARGETS; i++, y++)
{
basenames[y] = g_strdup_printf("%s.%s", pixmap_id_mapping->name,
ext_targets[i]);
diff -r 72ec4db929ed -r 9d2c175e458e audacious/skinwin.c
--- a/audacious/skinwin.c Sat Feb 18 13:21:21 2006 -0800
+++ b/audacious/skinwin.c Sat Feb 18 14:02:57 2006 -0800
@@ -281,9 +281,6 @@
for (entry = skinlist; entry; entry = g_list_next(entry)) {
thumbnail = skin_get_thumbnail(SKIN_NODE(entry->data)->path);
- if (!thumbnail)
- continue;
-
formattedname = g_strdup_printf("%s\n%s",
SKIN_NODE(entry->data)->name, SKIN_NODE(entry->data)->desc);
name = SKIN_NODE(entry->data)->name;
@@ -293,7 +290,8 @@
SKIN_VIEW_COL_PREVIEW, thumbnail,
SKIN_VIEW_COL_FORMATTEDNAME, formattedname,
SKIN_VIEW_COL_NAME, name, -1);
- g_object_unref(thumbnail);
+ if (thumbnail)
+ g_object_unref(thumbnail);
g_free(formattedname);
if (g_strstr_len(bmp_active_skin->path,