[terminator/f17] fix an issue when inactive colour is set to 1.0 (RHBZ#968379)

[Dominic Hopf]

commit b2d5194ae3d931e3465c020fd8b3138c922f7e4c
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sat Jun 29 00:22:09 2013 +0200

    fix an issue when inactive colour is set to 1.0 (RHBZ#968379)

 0001-terminator-fix-inactive-colour.patch |   35 +++++++++++++++++++++++++++++
 terminator-fix-NewWindow-issue.patch      |   11 ---------
 terminator.spec                           |    7 +++++-
 3 files changed, 41 insertions(+), 12 deletions(-)
---
diff --git a/0001-terminator-fix-inactive-colour.patch b/0001-terminator-fix-inactive-colour.patch
new file mode 100644
index 0000000..9e35d7d
--- /dev/null
+++ b/0001-terminator-fix-inactive-colour.patch
@@ -0,0 +1,35 @@
+=== modified file 'terminatorlib/prefseditor.py'
+--- terminatorlib/prefseditor.py	2013-02-16 00:10:45 +0000
++++ terminatorlib/prefseditor.py	2013-05-11 22:03:46 +0000
+@@ -923,6 +923,8 @@
+ 
+     def on_inactive_color_offset_change_value(self, widget, scroll, value):
+         """Inactive color offset setting changed"""
++        if value > 1.0:
++          value = 1.0
+         self.config['inactive_color_offset'] = round(value, 2)
+         self.config.save()
+ 
+
+=== modified file 'terminatorlib/terminal.py'
+--- terminatorlib/terminal.py	2013-02-15 15:10:55 +0000
++++ terminatorlib/terminal.py	2013-05-11 22:03:46 +0000
+@@ -621,11 +621,17 @@
+ 
+         factor = self.config['inactive_color_offset']
+         self.fgcolor_inactive = self.fgcolor_active.copy()
++        dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)", getattr(self.fgcolor_inactive, "red"),
++                                                      getattr(self.fgcolor_inactive, "green"),
++                                                      getattr(self.fgcolor_inactive, "blue")))
+ 
+         for bit in ['red', 'green', 'blue']:
+             setattr(self.fgcolor_inactive, bit,
+                     getattr(self.fgcolor_inactive, bit) * factor)
+ 
++        dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)", getattr(self.fgcolor_inactive, "red"),
++                                                      getattr(self.fgcolor_inactive, "green"),
++                                                      getattr(self.fgcolor_inactive, "blue")))
+         colors = self.config['palette'].split(':')
+         self.palette_active = []
+         self.palette_inactive = []
+
diff --git a/terminator.spec b/terminator.spec
index 3d52d50..c3be4c1 100644
--- a/terminator.spec
+++ b/terminator.spec
@@ -2,7 +2,7 @@
 
 Name:           terminator
 Version:        0.97
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Store and run multiple GNOME terminals in one window
 
 Group:          User Interface/Desktops
@@ -10,6 +10,7 @@ License:        GPLv2
 URL:            http://www.tenshu.net/terminator
 Source0:        https://launchpad.net/terminator/trunk/%{version}/+download/terminator-%{version}.tar.gz
 Patch0:         0000-terminator-fix-desktop-file.patch
+Patch1:         0001-terminator-fix-inactive-colour.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel gettext desktop-file-utils intltool
@@ -29,6 +30,7 @@ arrangements of terminals for different tasks.
 %setup -q 
 sed -i '/#! \?\/usr.*/d' terminatorlib/*.py
 %patch0 
+%patch1 
 
 
 %build
@@ -72,6 +74,9 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jun 28 2013 Dominic Hopf <dmaphy at fedoraproject.org> - 0.97-2
+- fix an issue when inactive colour is set to 1.0 (RHBZ#968379)
+
 * Fri May 17 2013 Dominic Hopf <dmaphy at fedoraproject.org> - 0.97-1
 - New upstream release: Terminator 0.97