/[pkg-kde]/trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff
ViewVC logotype

Diff of /trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 144 by ccheney, Thu Jul 22 07:29:17 2004 UTC revision 145 by ccheney, Mon Aug 2 23:43:14 2004 UTC
# Line 1  Line 1 
1  diff -Nrua kdelibs-3.2.3/kdecore/kstandarddirs.cpp kdelibs-patched/kdecore/kstandarddirs.cpp  diff -Nrua kdelibs-3.2.3/kdecore/kstandarddirs.cpp kdelibs-patched/kdecore/kstandarddirs.cpp
2  --- kdelibs-3.2.3/kdecore/kstandarddirs.cpp     2004-06-12 14:29:06.000000000 -0500  --- kdelibs-3.2.3/kdecore/kstandarddirs.cpp     2004-07-22 02:59:13.000000000 -0500
3  +++ kdelibs-patched/kdecore/kstandarddirs.cpp   2004-06-12 14:29:53.000000000 -0500  +++ kdelibs-patched/kdecore/kstandarddirs.cpp   2004-07-22 02:59:41.000000000 -0500
4  @@ -727,6 +727,10 @@  @@ -748,6 +748,10 @@
5                       if ((local || testdir.exists()) && !candidates->contains(path))                       if ((local || testdir.exists()) && !candidates->contains(path))
6                           candidates->append(path);                           candidates->append(path);
7                   }                   }
8  +                // UGLY HACK - Chris Cheney  +                // UGLY HACK - Chris Cheney
9  +                if (local && ("config" == type))  +                if (local && (!strcmp("config", type)))
10  +                   candidates->append("/etc/kde3/");  +                   candidates->append("/etc/kde3/");
11  +                //  +                //
12                   local = false;                   local = false;
13               }               }
14           }           }
15  @@ -902,7 +906,7 @@  @@ -923,7 +927,7 @@
16       if (!strcmp(type, "data"))       if (!strcmp(type, "data"))
17          return "share/apps/";          return "share/apps/";
18       if (!strcmp(type, "html"))       if (!strcmp(type, "html"))
# Line 21  diff -Nrua kdelibs-3.2.3/kdecore/kstanda Line 21  diff -Nrua kdelibs-3.2.3/kdecore/kstanda
21       if (!strcmp(type, "icon"))       if (!strcmp(type, "icon"))
22          return "share/icons/";          return "share/icons/";
23       if (!strcmp(type, "config"))       if (!strcmp(type, "config"))
24  @@ -922,7 +926,7 @@  @@ -943,7 +947,7 @@
25       if (!strcmp(type, "mime"))       if (!strcmp(type, "mime"))
26          return "share/mimelnk/";          return "share/mimelnk/";
27       if (!strcmp(type, "cgi"))       if (!strcmp(type, "cgi"))
# Line 30  diff -Nrua kdelibs-3.2.3/kdecore/kstanda Line 30  diff -Nrua kdelibs-3.2.3/kdecore/kstanda
30       if (!strcmp(type, "wallpaper"))       if (!strcmp(type, "wallpaper"))
31          return "share/wallpapers/";          return "share/wallpapers/";
32       if (!strcmp(type, "templates"))       if (!strcmp(type, "templates"))
33  @@ -1092,6 +1096,9 @@  @@ -1113,6 +1117,9 @@
34             kdedirList.append(kdedir);             kdedirList.append(kdedir);
35           }           }
36       }       }
Legend:
Removed from v.144  
changed lines
  Added in v.145
  ViewVC Help
Powered by ViewVC 1.1.5