summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2007-01-08 13:16:10 +0000
committerAlexander Larsson <alexl@redhat.com>2007-01-08 13:16:10 +0000
commite54ef4b65ae0eab72ffe23e18a470072e1719471 (patch)
tree0c740e3ff0b5a74e06057f76694027aaae9b0c64
parente0c44ae70cade58a511b42496f9272fb86b1e4d4 (diff)
Add fixes for hicolor lookup from Octavio Alvarez Piza
-rw-r--r--spec/icon-theme-spec.xml27
1 files changed, 23 insertions, 4 deletions
diff --git a/spec/icon-theme-spec.xml b/spec/icon-theme-spec.xml
index 24ef5b9..7554b0f 100644
--- a/spec/icon-theme-spec.xml
+++ b/spec/icon-theme-spec.xml
@@ -477,6 +477,11 @@ FindIcon(icon, size) {
filename = FindIconHelper(icon, size, user selected theme);
if filename != none
return filename
+
+ filename = FindIconHelper(icon, size, "hicolor");
+ if filename != none
+ return filename
+
return LookupFallbackIcon (icon)
}
FindIconHelper(icon, size, theme) {
@@ -486,8 +491,6 @@ FindIconHelper(icon, size, theme) {
if theme has parents
parents = theme.parents
- else if theme != hicolor
- parents = [hicolor]
for parent in parents {
filename = FindIconHelper (icon, size, parent)
@@ -579,6 +582,11 @@ FindBestIcon(iconList, size) {
filename = FindBestIconHelper(iconList, size, user selected theme);
if filename != none
return filename
+
+ filename = FindBestIconHelper(iconList, size, "hicolor");
+ if filename != none
+ return filename
+
for icon in iconList {
filename = LookupFallbackIcon (icon)
if filename != none
@@ -595,8 +603,6 @@ FindBestIconHelper(iconList, size, theme) {
if theme has parents
parents = theme.parents
- else if theme != hicolor
- parents = [hicolor]
for parent in parents {
filename = FindBestIconHelper (iconList, size, parent)
@@ -736,6 +742,19 @@ AttachPoints=20,20|40,40|50,10|10,50</programlisting>
<appendix id="changes">
<title>Change history</title>
<formalpara>
+ <title>Version 0.12, 24 December 2006, Octavio Alvarez</title>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Fixed "hicolor" lookup in the pseudocode, so it works with multiple
+ parents.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </formalpara>
+ <formalpara>
<title>Version 0.11, 7 February 2006, Alexander Larsson</title>
<para>
<itemizedlist>