diff --git a/ChangeLog b/ChangeLog
index 5b37040..53e8059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 ------------------------------------------------------------------------------
 CHANGELOG
 ------------------------------------------------------------------------------
+2006-10-30  Andreas Røsdal  <andrearo@pvv.ntnu.no>
+
+	* src/lib/gtkui/gtkui.py: Silence a GtkWarning. 
+
 2006-10-30  Andreas Røsdal  <andrearo@pvv.ntnu.no>
 
 	* src/lib/gtkui/gtkui.py: Fix closing of the about-dialog.
diff --git a/src/lib/gtkui/gtkui.py b/src/lib/gtkui/gtkui.py
index 732d230..6fa9367 100644
--- a/src/lib/gtkui/gtkui.py
+++ b/src/lib/gtkui/gtkui.py
@@ -857,8 +857,9 @@ class GtkUI(glchess.ui.UI):
         self.__getWidget('menu_end_game_item').set_sensitive(enableWidgets)
 
         combo = self.__getWidget('history_combo')
-        if view is None:
-            combo.set_model(None)
+        if view is None: 
+	    if combo.get_model() != None:
+	        combo.set_model(None)
         else:
             (model, selected) = view._getModel()
             combo.set_model(model)
@@ -911,11 +912,11 @@ class GtkUI(glchess.ui.UI):
             self.__aboutDialog = loadGladeFile('about.glade', domain = 'glchess')
             self.__aboutDialog.signal_autoconnect(self)
         
-   def _on_glchess_about_dialog_close(self, widget, data = None):
-       """Gtk+ callback"""
-       self.__aboutDialog.get_widget('glchess_about_dialog').destroy()
-       self.__aboutDialog = None
-       return False
+    def _on_glchess_about_dialog_close(self, widget, data = None):
+        """Gtk+ callback"""
+        self.__aboutDialog.get_widget('glchess_about_dialog').destroy()
+        self.__aboutDialog = None
+        return False
         
     def _on_ai_window_delete_event(self, widget, data = None):
         """Gtk+ callback"""