From 9cc4d3e0eaf8d352e5bc43c07bffd60f3e37fcf9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 6 Jan 2011 12:46:34 -0700
Subject: [PATCH] ...

---
 src/calibre/gui2/convert/__init__.py      | 3 +++
 src/calibre/gui2/convert/look_and_feel.py | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/convert/__init__.py b/src/calibre/gui2/convert/__init__.py
index c1efe5b9af..1557ce8939 100644
--- a/src/calibre/gui2/convert/__init__.py
+++ b/src/calibre/gui2/convert/__init__.py
@@ -183,6 +183,7 @@ class Widget(QWidget):
     def set_value(self, g, val):
         from calibre.gui2.convert.xpath_wizard import XPathEdit
         from calibre.gui2.convert.regex_builder import RegexEdit
+        from calibre.gui2.widgets import EncodingComboBox
         if self.set_value_handler(g, val):
             return
         if isinstance(g, (QSpinBox, QDoubleSpinBox)):
@@ -201,6 +202,8 @@ class Widget(QWidget):
             g.setCheckState(Qt.Checked if bool(val) else Qt.Unchecked)
         elif isinstance(g, (XPathEdit, RegexEdit)):
             g.edit.setText(val if val else '')
+        elif isinstance(g, EncodingComboBox):
+            g.setEditText(val if val else '')
         else:
             raise Exception('Can\'t set value %s in %s'%(repr(val),
                 unicode(g.objectName())))
diff --git a/src/calibre/gui2/convert/look_and_feel.py b/src/calibre/gui2/convert/look_and_feel.py
index 8e72814388..98b9cb8155 100644
--- a/src/calibre/gui2/convert/look_and_feel.py
+++ b/src/calibre/gui2/convert/look_and_feel.py
@@ -56,9 +56,6 @@ class LookAndFeelWidget(Widget, Ui_Form):
                     g.setCurrentIndex(i)
                     break
             return True
-        if g is self.opt_input_encoding:
-            g.setEditText(val if val else '')
-            return True
 
     def font_key_wizard(self):
         from calibre.gui2.convert.font_key import FontKeyChooser