← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kdebase/lucid

« back to all changes in this revision

Viewing changes to apps/kinfocenter/ioslaveinfo/kcmioslaveinfo.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2009-12-02 13:28:20 UTC
  • mto: This revision was merged to the branch mainline in revision 258.
  • Revision ID: james.westby@ubuntu.com-20091202132820-tpxn348l9frx5zd5
Tags: upstream-4.3.80
Import upstream version 4.3.80

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/kinfocenter/ioslaveinfo/kcmioslaveinfo.cpp
134
134
}
135
135
 
136
136
void KCMIOSlaveInfo::showInfo(const QString& protocol) {
137
 
        QString file = QString("kioslave/%1/index.docbook").arg(protocol);
 
137
        //get X-DocPath entry "foo/index.html" from .protocol file
 
138
        QString docPath=KProtocolInfo::docPath (protocol);
 
139
        QString file = docPath;
 
140
        //check for "foo/index.docbook" to get rid of the error dialog from KShortUriFilter
 
141
        //the error message is displayed in the dialog window here
 
142
        file.replace ( QString(".html"), QString(".docbook") );
138
143
        file = KGlobal::locale()->langLookup(file);
139
 
 
140
144
        if (!file.isEmpty()) {
141
145
                m_info->view()->setUpdatesEnabled(false);
142
 
                m_info->openUrl(KUrl(QString("help:/kioslave/%1/index.html").arg(protocol)));
 
146
                m_info->openUrl(KUrl(QString( "help:/%1" ).arg(docPath)));
143
147
                return;
144
148
        }
145
149
        m_info->begin();