jdahlin - in flumotion/trunk: . flumotion/component/effects/volume

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Thu Dec 20 20:11:18 2007
New Revision: 6025

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/effects/volume/admin_gtk.py
Log:
2007-12-20  Johan Dahlin  <johan at gnome.org>

	* flumotion/component/effects/volume/admin_gtk.py (VolumeAdminGtkNode.volumeSet): 
        Ensure that the scale has an adjustment.
        This is not a proper solution to a problem that can be when switching 
	components, but it avoids an unexpected segfault in set_value which expects
        range->adjustment to be non-NULL



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Thu Dec 20 20:11:18 2007
@@ -1,5 +1,11 @@
 2007-12-20  Johan Dahlin  <johan at gnome.org>
 
+	* flumotion/component/effects/volume/admin_gtk.py (VolumeAdminGtkNode.volumeSet): 
+        Ensure that the scale has an adjustment.
+        This is not a proper solution to a problem that can be when switching 
+	components, but it avoids an unexpected segfault in set_value which expects
+        range->adjustment to be non-NULL
+
 	* flumotion/common/registry.py (RegistryDirectory._rebuildNeeded): 
 	Remove bogus assert, so FLU_PROJECT_PATH can be set to a directory
 	without registry files. Makes it possible to have a unified environment
@@ -28,7 +34,7 @@
 	Update the timestamp after successfully connecting to a manager
 
 	Fixes #810
-
+	
 2007-12-19  Johan Dahlin  <johan at gnome.org>
 
 	* misc/pycheckerrc (blacklist): Add kiwi and kiwi.ui

Modified: flumotion/trunk/flumotion/component/effects/volume/admin_gtk.py
==============================================================================
--- flumotion/trunk/flumotion/component/effects/volume/admin_gtk.py	(original)
+++ flumotion/trunk/flumotion/component/effects/volume/admin_gtk.py	Thu Dec 20 20:11:18 2007
@@ -139,6 +139,14 @@
     # when volume has been set by another admin client
     def volumeSet(self, volume):
         self._hscale.handler_block(self._scale_changed_id)
+
+        # Ensure that the scale has an adjustment.
+        # This is not a proper solution to a problem that
+        # can be when switching components, but it avoids an
+        # unexpected segfault in set_value which expects
+        # range->adjustment to be non-NULL
+        self._hscale.get_adjustment()
+
         self._hscale.set_value(volume)
         self.debug("volume: %f", volume)
         dB = "- inf"