← Back to branch summary

~ubuntu-branches/ubuntu/feisty/kdelibs/feisty-proposed

« back to all changes in this revision

Viewing changes to kdeprint/management/kminfopage.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2006-11-14 22:45:03 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20061114224503-t1rr58e2xv9hzd0u
Tags: 4:3.5.5a.dfsg.1-3ubuntu1
* Merge with Debian
* Add --enable-gcc-hidden-visibility
* Delta from Deban in KUBUNTU-DEBIAN-CHANGES

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdeprint/management/kminfopage.cpp
127
127
                {
128
128
                        QString s;
129
129
                        for (QStringList::ConstIterator it=p->members().begin(); it!=p->members().end(); ++it)
130
 
                                s.append((*it) + ", ");
 
130
                                s.append(KURL(*it).prettyURL() + ", ");
131
131
                        s.truncate(s.length()-2);
132
132
                        m_device->setText(s);
133
133
                }
135
135
                {
136
136
                        // double decoding in case printer name contains
137
137
                        // annoying chars like '#'
138
 
                        m_device->setText(KURL::decode_string(p->device()));
 
138
                        KURL dev(p->device());
 
139
                        m_device->setText(KURL::decode_string(dev.prettyURL()));
139
140
                }
140
141
                m_model->setText(p->driverInfo());
141
142
        }