From 5739f330f154e8c6c822a660605038764d80dacf Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 6 Sep 2012 20:28:02 +0100
Subject: [PATCH] Allow camera to be NULL

Re-add 9a977e23d9f399b8ae2afab98cddec0022e5a276 accidentally
reverted
---
 src/frontend/entangle-control-panel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/entangle-control-panel.c b/src/frontend/entangle-control-panel.c
index f56d1b6..e0e449b 100644
--- a/src/frontend/entangle-control-panel.c
+++ b/src/frontend/entangle-control-panel.c
@@ -708,7 +708,7 @@ void entangle_control_panel_set_camera(EntangleControlPanel *panel,
                                        EntangleCamera *cam)
 {
     g_return_if_fail(ENTANGLE_IS_CONTROL_PANEL(panel));
-    g_return_if_fail(ENTANGLE_IS_CAMERA(cam));
+    g_return_if_fail(!cam || ENTANGLE_IS_CAMERA(cam));
 
     EntangleControlPanelPrivate *priv = panel->priv;
 
-- 
2.1.4