jdahlin - in flumotion/trunk: . flumotion/component/producers/videotest

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Thu Dec  6 10:07:45 2007
New Revision: 6000

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/producers/videotest/admin_gtk.py
Log:
2007-12-06  Johan Dahlin  <johan at gnome.org>

	* flumotion/component/producers/videotest/admin_gtk.py:
	Remove unused imports and update to use FCProxyComboBox.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Thu Dec  6 10:07:45 2007
@@ -1,3 +1,8 @@
+2007-12-06  Johan Dahlin  <johan at gnome.org>
+
+	* flumotion/component/producers/videotest/admin_gtk.py:
+	Remove unused imports and update to use FCProxyComboBox.
+
 2007-12-05  Johan Dahlin  <johan at gnome.org>
 
 	* po/sv.po: Update swedish translation

Modified: flumotion/trunk/flumotion/component/producers/videotest/admin_gtk.py
==============================================================================
--- flumotion/trunk/flumotion/component/producers/videotest/admin_gtk.py	(original)
+++ flumotion/trunk/flumotion/component/producers/videotest/admin_gtk.py	Thu Dec  6 10:07:45 2007
@@ -25,9 +25,6 @@
 
 import gtk
 
-from twisted.internet import defer
-
-from flumotion.common import errors
 from flumotion.component.base.admin_gtk import BaseAdminGtk, BaseAdminGtkNode
 from flumotion.ui import fgtk
 from flumotion.wizard import enums
@@ -41,7 +38,7 @@
         label = gtk.Label(_("Pattern:"))
         self.widget.attach(label, 0, 1, 0, 1, 0, 0, 6, 6)
         label.show()
-        self.combobox_pattern = fgtk.FComboBox()
+        self.combobox_pattern = fgtk.FProxyComboBox()
         self.combobox_pattern.set_enum(enums.VideoTestPattern)
         self.pattern_changed_id = self.combobox_pattern.connect('changed',
             self.cb_pattern_changed)
@@ -62,7 +59,7 @@
                 failure.type, failure.getErrorMessage()))
             return None
 
-        pattern = combobox.get_value()
+        pattern = combobox.get_active()
         d = self.callRemote("setPattern", pattern)
         d.addErrback(_setPatternErrback)