diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 20:01:54 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 20:58:45 +0200 |
| commit | 3e88ddfbc3df52c97d5354890fb9ac68af49bddd (patch) | |
| tree | f6830215ebdc83e794a7a223042537595490265f /kmenuedit | |
| parent | 5607b4ae2272da03b692475c2f773f3e27e671b8 (diff) | |
| download | tdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.tar.gz tdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.zip | |
Additional k => tde renaming and fixes
Diffstat (limited to 'kmenuedit')
| -rw-r--r-- | kmenuedit/Makefile.am | 2 | ||||
| -rw-r--r-- | kmenuedit/basictab.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/kmenuedit/Makefile.am b/kmenuedit/Makefile.am index 7f54096c7..d385186e7 100644 --- a/kmenuedit/Makefile.am +++ b/kmenuedit/Makefile.am @@ -11,7 +11,7 @@ CLEANFILES = dummy.cpp libkmenueditcommon_la_SOURCES = basictab.cpp treeview.cpp kmenuedit.cpp \ khotkeys.cpp menufile.cpp menuinfo.cpp -libkmenueditcommon_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) +libkmenueditcommon_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) libkmenueditcommon_la_LDFLAGS = $(all_libraries) -module -avoid-version kmenuedit_la_SOURCES = main.cpp diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index 5ecb9366c..32dba3f3e 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -366,7 +366,12 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo) _pathEdit->lineEdit()->setText(df->readPath()); _termOptEdit->setText(df->readEntry("TerminalOptions")); - _uidEdit->setText(df->readEntry("X-TDE-Username")); + if( df->hasKey( "X-TDE-Username" )) { + _uidEdit->setText(df->readEntry("X-TDE-Username")); + } + else { + _uidEdit->setText(df->readEntry("X-KDE-Username")); + } if( df->hasKey( "StartupNotify" )) _launchCB->setChecked(df->readBoolEntry("StartupNotify", true)); |