From 75613fd6730287301db372f4d35beb6a8444a691 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Sat, 13 Feb 2016 07:53:59 -0500 Subject: [PATCH] First API breakage, make the camera not crash --- mugshot/CameraMugshotDialog.py | 7 +++++-- po/mugshot.pot | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mugshot/CameraMugshotDialog.py b/mugshot/CameraMugshotDialog.py index db7ceb1..f85d01e 100644 --- a/mugshot/CameraMugshotDialog.py +++ b/mugshot/CameraMugshotDialog.py @@ -72,8 +72,11 @@ class CameraBox(GtkClutter.Embed): self.state = Gst.State.PLAYING def added(signal, data): - node = data.get_device_node() - self.camera.set_device_by_device_node(node) + if ("get_device_node" in dir(data)): + node = data.get_device_node() + self.camera.set_device_by_device_node(node) + else: + self.camera.set_device(data) self.camera.switch_camera_device() device_monitor = Cheese.CameraDeviceMonitor.new() diff --git a/po/mugshot.pot b/po/mugshot.pot index f40cd7e..f84c894 100644 --- a/po/mugshot.pot +++ b/po/mugshot.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-06 16:45-0400\n" +"POT-Creation-Date: 2016-02-13 07:53-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -103,7 +103,7 @@ msgstr "" #. Set the record button to retry, and disable it until the capture #. finishes. -#: ../mugshot/CameraMugshotDialog.py:236 +#: ../mugshot/CameraMugshotDialog.py:239 msgid "Retry" msgstr ""