summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2006-02-18 21:59:22 +0000
committerTony Vroon <chainsaw@gentoo.org>2006-02-18 21:59:22 +0000
commit33563c02708d7e47d85ab5e0511a893f8ce662e6 (patch)
treed2e9511a2577f73e00a54c7ba1446e9a878e981e /media-sound/audacious/files
parentMark 0.8.11 stable on ia64 (diff)
downloadhistorical-33563c02708d7e47d85ab5e0511a893f8ce662e6.tar.gz
historical-33563c02708d7e47d85ab5e0511a893f8ce662e6.tar.bz2
historical-33563c02708d7e47d85ab5e0511a893f8ce662e6.zip
Two additional patches submitted, closes bugs #123312 & #123313. Thanks to Michael Hanselmann <hansmi@gentoo.org> & Daniel Drake <dsd@gentoo.org>.
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'media-sound/audacious/files')
-rw-r--r--media-sound/audacious/files/0.2-segfault.diff11
-rw-r--r--media-sound/audacious/files/0.2-thumbnail.diff22
2 files changed, 33 insertions, 0 deletions
diff --git a/media-sound/audacious/files/0.2-segfault.diff b/media-sound/audacious/files/0.2-segfault.diff
new file mode 100644
index 000000000000..8953efaaa40a
--- /dev/null
+++ b/media-sound/audacious/files/0.2-segfault.diff
@@ -0,0 +1,11 @@
+--- audacious-0.2.orig/audacious/skin.c 2006-01-16 19:32:57.000000000 +0100
++++ audacious-0.2/audacious/skin.c 2006-02-18 21:27:13.000000000 +0100
+@@ -330,7 +330,7 @@ skin_load_pixmap_id(Skin * skin, SkinPix
+
+ 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 --git a/media-sound/audacious/files/0.2-thumbnail.diff b/media-sound/audacious/files/0.2-thumbnail.diff
new file mode 100644
index 000000000000..7b028406c98b
--- /dev/null
+++ b/media-sound/audacious/files/0.2-thumbnail.diff
@@ -0,0 +1,22 @@
+--- audacious-0.2.orig/audacious/skinwin.c
++++ audacious-0.2/audacious/skinwin.c
+@@ -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("<big><b>%s</b></big>\n<i>%s</i>",
+ 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,