From 34755c4ebb25fd3d71f5814bd36ce476e8548f6b Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Sun, 23 Apr 2006 22:52:23 +0000
Subject: [PATCH] Update

svn: r6427
---
 gramps2/src/ColumnOrder.py          | 10 ++++------
 gramps2/src/plugins/FilterEditor.py |  4 ----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/gramps2/src/ColumnOrder.py b/gramps2/src/ColumnOrder.py
index 56215c5ff..cac8a60c5 100644
--- a/gramps2/src/ColumnOrder.py
+++ b/gramps2/src/ColumnOrder.py
@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2000-2003  Donald N. Allingham
+# Copyright (C) 2000-2006  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,15 +45,13 @@ class ColumnOrder(ManagedWindow.ManagedWindow):
         ManagedWindow.ManagedWindow.__init__(self, uistate, [], self)
         
         self.glade = gtk.glade.XML(const.gladeFile,"columns","gramps")
-
-        self.set_window(self.glade.get_widget('columns'))
+        self.set_window(self.glade.get_widget('columns'),None,
+                       _('Select Columns'))
 
         self.tree = self.glade.get_widget('list')
         self.arglist = arglist
         self.callback = callback
 
-        self.window.set_title("%s - GRAMPS" % _('Select Columns'))
-
         self.model = gtk.ListStore( bool , str , int , object )
         
         self.tree.set_model(self.model)
@@ -84,7 +82,7 @@ class ColumnOrder(ManagedWindow.ManagedWindow):
                            3, item)
 
     def build_menu_names(self,obj):
-        return (_('Column Editor'), _('Column Editor'))
+        return (_('Column Editor'), None)
 
     def ok_clicked(self,obj):
         newlist = []
diff --git a/gramps2/src/plugins/FilterEditor.py b/gramps2/src/plugins/FilterEditor.py
index 09002d914..54c5de6f4 100644
--- a/gramps2/src/plugins/FilterEditor.py
+++ b/gramps2/src/plugins/FilterEditor.py
@@ -362,10 +362,6 @@ class FilterEditor(ManagedWindow.ManagedWindow):
         """Display the relevant portion of GRAMPS manual"""
         GrampsDisplay.help('tools-util-cfe')
 
-    def set_window(self,window,title,text):
-        ManagedWindow.ManagedWindow.set_window(self,window)
-        Utils.set_titles(window,title,text)
-
     def on_delete_event(self,obj,b):
         self.filterdb.save()
         self.remove_itself_from_menu()