[gtk-v4l] - Don't try to reset inactive controls (avoids error dialogs)

[Hans de Goede]

commit 020fbc233a1513d959e6c31938b95b2d4b96315f
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Mar 12 23:32:02 2011 +0100

    - Don't try to reset inactive controls (avoids error dialogs)

 0001-Don-t-reset-inactive-controls.patch |   26 ++++++++++++++++++++++++++
 gtk-v4l.spec                             |    7 ++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-Don-t-reset-inactive-controls.patch b/0001-Don-t-reset-inactive-controls.patch
new file mode 100644
index 0000000..9fde4df
--- /dev/null
+++ b/0001-Don-t-reset-inactive-controls.patch
@@ -0,0 +1,26 @@
+From b7eb99eefe1007ab95b3aaa6bac603bbc6cb00d3 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Sat, 12 Mar 2011 23:27:28 +0100
+Subject: [PATCH] Don't reset inactive controls
+
+---
+ src/gtk-v4l-widget.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/gtk-v4l-widget.c b/src/gtk-v4l-widget.c
+index d5e60b2..df5efdc 100644
+--- a/src/gtk-v4l-widget.c
++++ b/src/gtk-v4l-widget.c
+@@ -517,7 +517,8 @@ void gtk_v4l_widget_reset_to_defaults (Gtkv4lWidget *self)
+        elem; elem = g_list_next (elem)) {
+     Gtkv4lControl *control = GTK_V4L_CONTROL (elem->data);
+ 
+-    if (control->flags & (V4L2_CTRL_FLAG_GRABBED | V4L2_CTRL_FLAG_READ_ONLY))
++    if (control->flags & (V4L2_CTRL_FLAG_GRABBED | V4L2_CTRL_FLAG_READ_ONLY |
++                          V4L2_CTRL_FLAG_INACTIVE))
+       continue;
+ 
+     gtk_v4l_widget_set_widget_value (control, control->default_value);
+-- 
+1.7.4
+
diff --git a/gtk-v4l.spec b/gtk-v4l.spec
index f4d4bfc..2aa2603 100644
--- a/gtk-v4l.spec
+++ b/gtk-v4l.spec
@@ -1,11 +1,12 @@
 Name:		gtk-v4l
 Version:	0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Video4Linux Device Preferences
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://fedorahosted.org/gtk-v4l
 Source0:	https://fedorahosted.org/releases/g/t/%{name}/%{name}-%{version}.tar.gz
+Patch0:         0001-Don-t-reset-inactive-controls.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	scrollkeeper
 BuildRequires:	libv4l-devel >= 0.6
@@ -18,6 +19,7 @@ gtk-v4l is a Video4Linux Web camera control app
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Mar 12 2011 Hans de Goede <hdegoede at redhat.com> - 0.3-4
+- Don't try to reset inactive controls (avoids error dialogs)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild