diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:16:20 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:16:20 -0600 |
commit | dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch) | |
tree | 4ebcd3dac0133d8d3fa880bbf83692c305b7350d /kcontrol/screensaver | |
parent | 1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff) | |
download | tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/screensaver')
-rw-r--r-- | kcontrol/screensaver/screensaver.desktop | 2 | ||||
-rw-r--r-- | kcontrol/screensaver/scrnsave.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/screensaver/screensaver.desktop b/kcontrol/screensaver/screensaver.desktop index f111fb676..566a8c506 100644 --- a/kcontrol/screensaver/screensaver.desktop +++ b/kcontrol/screensaver/screensaver.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=kcmshell screensaver -Icon=kscreensaver +Icon=tdescreensaver Type=Application DocPath=kcontrol/screensaver/index.html diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 4efb38e90..ba3c0eb66 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -506,7 +506,7 @@ void KScreenSaver::findSavers() TQListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 ); if ( !categoryItem ) { categoryItem = new TQListViewItem ( mSaverListView, s->category(), "1" + s->category() ); - categoryItem->setPixmap ( 0, SmallIcon ( "kscreensaver" ) ); + categoryItem->setPixmap ( 0, SmallIcon ( "tdescreensaver" ) ); } item = new TQListViewItem ( categoryItem, s->name(), s->name() ); categoryCount++; @@ -712,7 +712,7 @@ void KScreenSaver::slotSetup() (*mSetupProc) << word; word = "-icon"; (*mSetupProc) << word; - word = "kscreensaver"; + word = "tdescreensaver"; (*mSetupProc) << word; } |