Merge lp:~townsend/compiz/fix-ccsm-int-fields into lp:compiz/0.9.11

[Christopher Townsend]

Due to some change in Gtk SpinButton, setting the initial value in Adjustment does not work for integers, so now just explicitly set the value after the SpinButton is created.

Due to some change in Gtk SpinButton, setting the initial value in Adjustment does not work for integers, so now just explicitly set the value after the SpinButton is created.

Once this is applied, you should see any integer fields in CCSM now have the current value displayed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3857
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/61

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/61/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Nice. LGTM

review: Approve

=== modified file 'compizconfig/ccsm/ccm/Settings.py'
--- compizconfig/ccsm/ccm/Settings.py	2013-12-02 17:37:06 +0000
+++ compizconfig/ccsm/ccm/Settings.py	2014-04-11 15:58:55 +0000
@@ -439,8 +439,9 @@
             self.Inc = info[2]
         inc = self.Inc
         self.NoneValue = info[0]
-        self.Adj = gtk.Adjustment(self.Get(), info[0], info[1], inc, inc*10)
+        self.Adj = gtk.Adjustment(0, info[0], info[1], inc, inc*10)
         self.Spin = gtk.SpinButton(self.Adj)
+        self.Spin.set_value(self.Get())
 
         self.Scale = gtk.HScale(self.Adj)
 
 
=== modified file 'debian/patches/ccsm_remove_redundant_sliders.patch'
--- debian/patches/ccsm_remove_redundant_sliders.patch	2012-06-19 11:22:48 +0000
+++ debian/patches/ccsm_remove_redundant_sliders.patch	2014-04-11 15:58:55 +0000
@@ -1,11 +1,10 @@
 === modified file 'ccm/Settings.py'
-diff -Nur -x '*.orig' -x '*~' a/compizconfig/ccsm/ccm/Settings.py b/compizconfig/Settings.py
---- a/compizconfig/ccsm/ccm/Settings.py	2011-08-22 13:38:46.000000000 +0200
-+++ b/compizconfig/ccsm/ccm/Settings.py	2012-02-01 12:44:46.254767412 +0100
-@@ -441,16 +441,10 @@
-         self.NoneValue = info[0]
-         self.Adj = gtk.Adjustment(self.Get(), info[0], info[1], inc, inc*10)
+--- a/compizconfig/ccsm/ccm/Settings.py	2014-04-11 11:28:28.731117694 -0400
++++ b/compizconfig/ccsm/ccm/Settings.py	2014-04-11 11:29:59.443116911 -0400
+@@ -442,16 +442,10 @@
+         self.Adj = gtk.Adjustment(0, info[0], info[1], inc, inc*10)
          self.Spin = gtk.SpinButton(self.Adj)
+         self.Spin.set_value(self.Get())
 -
 -        self.Scale = gtk.HScale(self.Adj)
 -
@@ -21,7 +20,7 @@
  
      def _Read(self):
          self.Adj.set_value(self.Get())
-@@ -464,7 +458,6 @@
+@@ -465,7 +459,6 @@
          self.Inc = 1
          NumberSetting._Init(self)
          self.Spin.set_digits(0)
@@ -29,7 +28,7 @@
  
  class FloatSetting(NumberSetting):
  
-@@ -474,7 +467,6 @@
+@@ -475,7 +468,6 @@
          self.Inc = None
          NumberSetting._Init(self)
          self.Spin.set_digits(4)