← Back to branch summary

~ubuntu-branches/ubuntu/maverick/kdegraphics/maverick-proposed

« back to all changes in this revision

Viewing changes to kamera/kioslave/kamera.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2009-12-02 14:03:43 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20091202140343-2732gbkj69g89arq
Tags: 4:4.3.80-0ubuntu1
* New upstream beta release:
  - Add build-depend on shared-desktop-ontologies for nepomuk integration
  - Bump .so versions for libkexiv, libkdcraw and libkipi
  - Update various .install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
kamera/kioslave/kamera.cpp
441
441
 
442
442
                QString xname = current_camera + "@" + current_port;
443
443
                entry.insert( KIO::UDSEntry::UDS_NAME, xname);
 
444
                entry.insert( KIO::UDSEntry::UDS_DISPLAY_NAME, current_camera);
444
445
                entry.insert(KIO::UDSEntry::UDS_FILE_TYPE,S_IFDIR);
445
446
                entry.insert(KIO::UDSEntry::UDS_ACCESS,(S_IRUSR | S_IRGRP | S_IROTH));
446
447
                statEntry(entry);
644
645
                        } else {
645
646
                                xname = (*it)+"@"+m_cfgPath;
646
647
                        }
647
 
                        entry.insert(KIO::UDSEntry::UDS_NAME,*it);
648
 
 
649
 
                        KUrl nurl(yurl);
650
 
                        nurl.setPath(xname);
651
 
 
652
 
                        entry.insert(KIO::UDSEntry::UDS_TARGET_URL,nurl.url());
 
648
                        entry.insert(KIO::UDSEntry::UDS_NAME,xname);
 
649
                        // do not confuse regular users with the @usb... 
 
650
                        entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME,*it);
653
651
                        listEntry(entry, false);
654
652
                }
655
653
 
658
656
                for (portsit = ports.begin(); portsit != ports.end(); portsit++) {
659
657
                        entry.clear();
660
658
                        entry.insert(KIO::UDSEntry::UDS_FILE_TYPE,S_IFDIR);
661
 
                        entry.insert(KIO::UDSEntry::UDS_NAME, portsit.value());
 
659
                        // do not confuse regular users with the @usb... 
 
660
                        entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME,portsit.value());
 
661
                        entry.insert(KIO::UDSEntry::UDS_NAME, portsit.value()+"@"+portsit.key());
662
662
 
663
663
                        entry.insert(KIO::UDSEntry::UDS_ACCESS,(S_IRUSR | S_IRGRP | S_IROTH |S_IWUSR | S_IWGRP | S_IWOTH));
664
 
                        xurl.setProtocol("camera");
665
 
                        xurl.setPath("/"+portsit.value()+"@"+portsit.key());
666
 
                        entry.insert(KIO::UDSEntry::UDS_TARGET_URL,xurl.url());
667
664
                        listEntry(entry, false);
668
665
                }
669
666
                listEntry(entry, true);
881
878
        udsEntry.clear();
882
879
 
883
880
        udsEntry.insert(KIO::UDSEntry::UDS_FILE_TYPE,S_IFREG);
884
 
 
885
 
        if (info.file.fields & GP_FILE_INFO_NAME)
886
 
                udsEntry.insert(KIO::UDSEntry::UDS_NAME,QString::fromLocal8Bit(info.file.name));
887
 
        else
888
 
                udsEntry.insert(KIO::UDSEntry::UDS_NAME,name);
 
881
        udsEntry.insert(KIO::UDSEntry::UDS_NAME,name);
889
882
 
890
883
        if (info.file.fields & GP_FILE_INFO_SIZE) {
891
884
                udsEntry.insert(KIO::UDSEntry::UDS_SIZE,info.file.size);