diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-21 01:43:11 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-21 01:43:11 +0000 |
| commit | 549c7e4d630743ae94883997fec3b8fc31e32a22 (patch) | |
| tree | a805eda405ce448688b5fd5e560b19bf6ac75fb2 /kdm/kfrontend | |
| parent | c35987b35ecdd163e1b7e6718a36adec7a90032b (diff) | |
| download | tdebase-549c7e4d630743ae94883997fec3b8fc31e32a22.tar.gz tdebase-549c7e4d630743ae94883997fec3b8fc31e32a22.zip | |
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdm/kfrontend')
| -rw-r--r-- | kdm/kfrontend/genkdmconf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c index d10fe754b..bfbeda32a 100644 --- a/kdm/kfrontend/genkdmconf.c +++ b/kdm/kfrontend/genkdmconf.c @@ -594,12 +594,12 @@ static const char def_startup[] = " xmessage -file /etc/nologin -geometry 640x480\n" " fi\n" " if [ \"$(id -u)\" != \"0\" ] && \\\n" -" ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n" +" ! grep -qs '^ignore-nologin' /etc/trinity/kdm/kdm.options; then\n" " exit 1\n" " fi\n" "fi\n" "\n" -"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n" +"if grep -qs '^use-sessreg' /etc/trinity/kdm/kdm.options && \\\n" " which sessreg > /dev/null 2>&1; then\n" " exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n" " -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n" @@ -620,7 +620,7 @@ static const char def_reset[] = "#devname=`echo $DISPLAY | cut -c1-8`\n" "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\"" #else -"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n" +"if grep -qs '^use-sessreg' /etc/trinity/kdm/kdm.options && \\\n" " which sessreg > /dev/null 2>&1; then\n" " exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n" " -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n" @@ -2527,8 +2527,8 @@ fwrapprintf( FILE *f, const char *msg, ... ) static const char *oldkdes[] = { KDE_CONFDIR, - "/opt/kde3/share/config", - "/usr/local/kde3/share/config", + "/opt/trinity/share/config", + "/usr/local/trinity/share/config", "/opt/kde/share/config", "/usr/local/kde/share/config", @@ -2581,7 +2581,7 @@ int main( int argc, char **argv ) " --old-kde /path/to/old/kde-config-dir\n" " Where to look for the kdmrc of an older kdm.\n" " Default is to scan " KDE_CONFDIR " and\n" -" {/usr,/usr/local,{/opt,/usr/local}/{kde3,kde,kde2,kde1}}/share/config.\n" +" {/usr,/usr/local,{/opt,/usr/local}/{trinity,kde,kde2,kde1}}/share/config.\n" " --no-old\n" " Don't look at older xdm/kdm configurations, just create default config.\n" " --no-old-xdm\n" |