← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/emesene/oneiric

« back to all changes in this revision

Viewing changes to PreferenceWindow.py

  • Committer: Bazaar Package Importer
  • Author(s): Devid Antonio Filoni
  • Date: 2010-07-18 04:13:52 UTC
  • mfrom: (5.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100718041352-dsrfuyszjm7pnd3i
Tags: 1.6.3-1
* debian/control: add myself to Uploaders field.
* New upstream release.
* Add 21_svn2451_fix_avatar patch to fix avatars storage.
* Bump Standards-Version to 3.9.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
PreferenceWindow.py
1691
1691
            return
1692
1692
        count = 1
1693
1693
        for device, name in WebcamDevice.list_devices():
1694
 
            self.combobox.append_text(name)
1695
 
            self.webcamList.append((device, name))
1696
 
            if device == self.deviceID:
1697
 
                self.deviceIndex = count
1698
 
            count += 1
 
1694
            if name is not None:
 
1695
                self.combobox.append_text(name)
 
1696
                self.webcamList.append((device, name))
 
1697
                if device == self.deviceID:
 
1698
                    self.deviceIndex = count
 
1699
                count += 1
1699
1700
 
1700
1701
    def on_set_device(self,button):
1701
1702
        self.deviceIndex = self.combobox.get_active()