diff options
Diffstat (limited to 'kdesktop')
-rw-r--r-- | kdesktop/Makefile.am | 2 | ||||
-rw-r--r-- | kdesktop/kdesktop.kcfg | 24 | ||||
-rw-r--r-- | kdesktop/lock/Makefile.am | 2 | ||||
-rw-r--r-- | kdesktop/pics/Makefile.am | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am index 4d0c273e1..5cdaa8b4b 100644 --- a/kdesktop/Makefile.am +++ b/kdesktop/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kdesktop +## Makefile.am of tdebase/kdesktop INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(all_includes) kdesktop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg index 3994f5f89..a1a37b11c 100644 --- a/kdesktop/kdesktop.kcfg +++ b/kdesktop/kdesktop.kcfg @@ -266,84 +266,84 @@ <default>false</default> <label></label> <whatsthis></whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:308 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:308 --> <!-- if(config.readBoolEntry("Lock", false)) --> </entry> <entry key="LockGrace" type="Int"> <default>5000</default> <label></label> <whatsthis></whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:310 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:310 --> <!-- mLockGrace = config.readNumEntry("LockGrace", LOCK_GRACE_DEFAULT); --> </entry> <entry key="AutoLogout" type="Bool"> <default>false</default> <label></label> <whatsthis></whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:319 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:319 --> <!-- if (config.readBoolEntry("AutoLogout", false)) --> </entry> <entry key="AutoLogoutTimeout" type="Int"> <default>600</default> <label></label> <whatsthis></whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:322 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:322 --> <!-- mAutoLogoutTimeout = config.readNumEntry("AutoLogoutTimeout", AUTOLOGOUT_DEFAULT); --> </entry> <entry key="Priority" type="Int"> <default>19</default> <label></label> <whatsthis></whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:332 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:332 --> <!-- mPriority = config.readNumEntry("Priority", 19); --> </entry> <entry key="Saver" type="String"> <default></default> <label></label> <whatsthis></whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:336 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 --> <!-- mSaver = config.readEntry("Saver"); --> </entry> <entry key="UseUnmanagedLockWindows" type="Bool"> <default>false</default> <label></label> <whatsthis></whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:336 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 --> <!-- mSaver = config.readEntry("UseUnmanagedLockWindows"); --> </entry> <entry key="UseTDESAK" type="Bool"> <default>true</default> <label></label> <whatsthis>Set to true to enable usage of the Trinity SAK anti-spoofing system</whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:336 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 --> <!-- mSaver = config.readEntry("UseTDESAK"); --> </entry> <entry key="ShowLockDateTime" type="Bool"> <default>true</default> <label></label> <whatsthis>Set to true to enable display of the date and time of desktop lock as an additional intrusion detection measure</whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:336 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 --> <!-- mSaver = config.readEntry("ShowLockDateTime"); --> </entry> <entry key="DelaySaverStart" type="Bool"> <default>true</default> <label></label> <whatsthis></whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:336 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 --> <!-- mSaver = config.readEntry("UseUnmanagedLockWindows"); --> </entry> <entry key="PluginsUnlock" type="StringList"> <default></default> <label></label> <whatsthis></whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:342 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:342 --> <!-- mPlugins = config.readListEntry("PluginsUnlock"); --> </entry> <entry key="PluginOptions" type="StringList"> <default></default> <label></label> <whatsthis></whatsthis> - <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:345 --> + <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:345 --> <!-- mPluginOptions = config.readListEntry("PluginOptions"); --> </entry> </group> diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am index 270f9e35c..7a1841086 100644 --- a/kdesktop/lock/Makefile.am +++ b/kdesktop/lock/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kdesktop/lock +## Makefile.am of tdebase/kdesktop/lock INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes) kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kdesktop/pics/Makefile.am b/kdesktop/pics/Makefile.am index 79bb5381a..e70a08590 100644 --- a/kdesktop/pics/Makefile.am +++ b/kdesktop/pics/Makefile.am @@ -1,4 +1,4 @@ -# Makefile.am of kdebase/kdesktop/pics +# Makefile.am of tdebase/kdesktop/pics pics_DATA = ksslogo.png splash.png splash2.png kde2.xbm |