← Back to branch summary

~ubuntu-branches/ubuntu/saucy/hplip/saucy-proposed

« back to all changes in this revision

Viewing changes to ui4/wifisetupdialog.py

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-26 11:20:39 UTC
  • mfrom: (1.5.6) (31.1.3 precise)
  • Revision ID: package-import@ubuntu.com-20120526112039-bevxczegxnbyr5m7
Tags: 3.12.4-1
http://bugs.debian.org/667828
http://bugs.debian.org/583273
http://bugs.debian.org/666544
* New upstream release
* Switch to source/format 3.0 (quilt) - drop dpatch
* Refreshed debian/patches
* dh_autoreconf debian/autogen.sh & set local-options single-debian-patch
* Update to debian/compat -> 9
* Fix "hardened build flags" patch from Moritz - thanks (Closes: #667828)
* Fix "duplex descriptor uninitialized" patch from Matej (Closes: #583273)
* Fix "please migrate to kde-runtime" patch from Pino (Closes: #666544)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ui4/wifisetupdialog.py
86
86
        self.adapterName = 'Wifi0'
87
87
        self.wifiObj = wifi
88
88
 
89
 
        if self.device_uri is None:
90
 
            QTimer.singleShot(0, self.showIntroPage)
91
 
        else:
92
 
            QTimer.singleShot(0, self.showNetworkPage)
 
89
        #if self.device_uri is None:
 
90
        #    QTimer.singleShot(0, self.showIntroPage)
 
91
        #else:
 
92
        #    QTimer.singleShot(0, self.showNetworkPage)
 
93
 
 
94
        QTimer.singleShot(0, self.showIntroPage)
93
95
 
94
96
 
95
97
    #
685
687
            if row != -1:
686
688
                self.device_uri = self.DevicesTableWidget.item(row, 0).device_uri
687
689
                self.mq = device.queryModelByURI(self.device_uri)
 
690
                
688
691
                self.getWifiObject(self.mq['wifi-config'])               
689
692
                back_end, is_hp, bus, model, serial, dev_file, host, zc, port = device.parseDeviceURI(self.device_uri)
690
693
                self.model = models.normalizeModelName(model).lower()