summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-08-04 07:14:03 (UTC)
committer llornkcor <llornkcor>2005-08-04 07:14:03 (UTC)
commit32743ebb00d374ad18afbed69ab3e94b03699a57 (patch) (unidiff)
treeef73f41d2a76c15f0c31f0bcdec9fbf63ba5743f
parent30a5df87b42e35c48932a2041944e59021568f38 (diff)
downloadopie-32743ebb00d374ad18afbed69ab3e94b03699a57.zip
opie-32743ebb00d374ad18afbed69ab3e94b03699a57.tar.gz
opie-32743ebb00d374ad18afbed69ab3e94b03699a57.tar.bz2
fix # 0001687: opening desktop file
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/mainwindow/tinykate.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/noncore/apps/tinykate/mainwindow/tinykate.cpp b/noncore/apps/tinykate/mainwindow/tinykate.cpp
index bbb0be7e..e808a2e 100644
--- a/noncore/apps/tinykate/mainwindow/tinykate.cpp
+++ b/noncore/apps/tinykate/mainwindow/tinykate.cpp
@@ -202,10 +202,9 @@ void TinyKate::open(const QString & filename)
202 KateDocument *kd= new KateDocument(false, false, this,0,this); 202 KateDocument *kd= new KateDocument(false, false, this,0,this);
203 KTextEditor::View *kv; 203 KTextEditor::View *kv;
204 QString realFileName; 204 QString realFileName;
205 //check if filename is a .desktop file 205 //check if filename is a .desktop file
206 if ( filename.find( ".desktop", 0, true ) ) 206 if ( filename.find( ".desktop", 0, true ) != -1 ) {
207 {
208 switch ( QMessageBox::warning( this, tr( "TinyKATE" ), 207 switch ( QMessageBox::warning( this, tr( "TinyKATE" ),
209 tr("TinyKATE has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?" ), 208 tr("TinyKATE has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?" ),
210 tr(".desktop File"), 209 tr(".desktop File"),
211 tr("Linked Document"), 0, 1, 1 ) ) 210 tr("Linked Document"), 0, 1, 1 ) )
@@ -217,8 +216,10 @@ void TinyKate::open(const QString & filename)
217 DocLnk docLnk( filename ); 216 DocLnk docLnk( filename );
218 realFileName = docLnk.file(); 217 realFileName = docLnk.file();
219 break; 218 break;
220 }; 219 };
220 } else {
221 realFileName = filename;
221 } 222 }
222 223
223 QFileInfo fileInfo( realFileName ); 224 QFileInfo fileInfo( realFileName );
224 QString filenamed = fileInfo.fileName(); 225 QString filenamed = fileInfo.fileName();