ljp: fixed setDocument opening the .desktop file and not the file it points too

1 files changed, 6 insertions, 3 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index f138572..0f19da9 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -787,100 +787,103 @@ bool TextEdit::saveAs()
 
             FileManager fm;
             if ( !fm.saveFile( *doc, rt ) ) {
                 return false;
             }
             if( fileSaveDlg->filePermCheck->isChecked() ) {
                 filePermissions *filePerm;
                 filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)fileNm);
                 filePerm->exec();
                 editor->setEdited( false );
                 if( filePerm)
                     delete  filePerm;
             }
         }
     }
 
     if(fileSaveDlg)
         delete fileSaveDlg;
     return true;
 }
 
 void TextEdit::clear()
 {
     delete doc;
     doc = 0;
     editor->clear();
 }
 
 void TextEdit::updateCaption( const QString &name )
 {
     if ( !doc )
   setCaption( tr("Text Editor") );
     else {
   QString s = name;
   if ( s.isNull() )
       s = doc->name();
   if ( s.isEmpty()  ) {
       s = tr( "Unnamed" );
        currentFileName=s;
   }
 
   setCaption( s + " - " + tr("Text Editor") );
     }
 }
 
 void TextEdit::setDocument(const QString& fileref)
 {
     bFromDocView = TRUE;
+    qDebug("setDocument "+fileref);
+    bFromDocView = TRUE;
+    if(fileref.find(".desktop",0,TRUE) == -1) {
     openFile(fileref);
-//  bFromDocView = TRUE;
-//         openFile(DocLnk(fileref));
-//    showEditTools();
+    } else {
+      openFile(DocLnk(fileref));
+    }
 }
 
 void TextEdit::closeEvent( QCloseEvent *e )
 {
     if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) {
         e->ignore();
         repaint();
 //        fileRevert();
   
     } else {
         bFromDocView = FALSE;
         e->accept();
     }
 }
 
 void TextEdit::accept()
 {
     save();
     close();
 //    fileOpen(); //godamn thats obnoxious! lemme out!!!
 }
 
 void TextEdit::changeFont() {
     FontDatabase fdb;
     QFont defaultFont=editor->font();
     QFontInfo fontInfo(defaultFont);
     Config cfg("TextEdit");
     cfg.setGroup("Font");
     QString family = cfg.readEntry("Family", fontInfo.family());
     QString style = cfg.readEntry("Style", fdb.styleString(defaultFont));
     int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10);
     QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) );
 
     defaultFont = fdb.font(family,style,i_size,charSet);
 
     FontDialog *fontDlg;
     fontDlg=new FontDialog(this,"FontDialog",TRUE);
 
     fontDlg->exec();
 
     QFont myFont=fontDlg->selectedFont;
     editor->setFont( myFont);
     delete fontDlg;
 
 }
 
 void TextEdit::editDelete()
 {