rev 10789 - branches/kde4/packages/kdelibs/debian/patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-05-29 14:26:41 +0000 (Thu, 29 May 2008)
New Revision: 10789

Added:
   branches/kde4/packages/kdelibs/debian/patches/21_kstandarddirs_prefer_kde4apps.diff
Log:
kstandarddirs hack (try 2)

Added: branches/kde4/packages/kdelibs/debian/patches/21_kstandarddirs_prefer_kde4apps.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/21_kstandarddirs_prefer_kde4apps.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/21_kstandarddirs_prefer_kde4apps.diff	2008-05-29 14:26:41 UTC (rev 10789)
@@ -0,0 +1,20 @@
+Index: kstandarddirs.cpp
+===================================================================
+--- a/kdecore/kernel/kstandarddirs.cpp   (revision 813271)
++++ b/kdecore/kernel/kstandarddirs.cpp   (working copy)
+@@ -1021,8 +1021,13 @@
+                     break;
+                 }
+             }
+-            if (ok)
+-                candidates.append(installdir);
++            if (ok) {
++                if (candidates.isEmpty()) {
++                    candidates.append(installdir);
++                } else {
++                    candidates.insert(1, installdir);
++                }
++            }
+         }
+
+         dirs = d->absolutes.value(type);
\ No newline at end of file