From 715b19a3b667f2f352ab72782a0a0e4e9add3cee Mon Sep 17 00:00:00 2001
From: Patrick Ulbrich <zulu99@gmx.net>
Date: Sat, 14 May 2011 19:01:43 +0200
Subject: [PATCH] rename filters to filter

---
 config_window.py | 24 ++++++++++++------------
 config_window.ui | 14 +++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/config_window.py b/config_window.py
index b78041a..069737c 100644
--- a/config_window.py
+++ b/config_window.py
@@ -61,7 +61,7 @@ class ConfigWindow:
 			"treeview_accounts_row_activated" : self.__on_treeview_accounts_row_activated, \
 			"liststore_accounts_row_deleted" : self.__on_liststore_accounts_row_deleted, \
 			"liststore_accounts_row_inserted" : self.__on_liststore_accounts_row_inserted, \
-			"chk_enable_filters_toggled" : self.__on_chk_enable_filters_toggled \
+			"chk_enable_filter_toggled" : self.__on_chk_enable_filter_toggled \
 		})
 
 		self.window = builder.get_object("config_window")
@@ -104,10 +104,10 @@ class ConfigWindow:
 		self.chk_autostart = builder.get_object("chk_autostart")
 		
 		#
-		# filters tab
-		self.chk_enable_filters = builder.get_object("chk_enable_filters")
-		self.textview_filters = builder.get_object("textview_filters")	
-		self.textbuffer_filters = builder.get_object("textbuffer_filters")	
+		# spam filter tab
+		self.chk_enable_filter = builder.get_object("chk_enable_filter")
+		self.textview_filter = builder.get_object("textview_filter")	
+		self.textbuffer_filter = builder.get_object("textbuffer_filter")	
 
 		#
 		# events tab
@@ -130,8 +130,8 @@ class ConfigWindow:
 		self.chk_autostart.set_active(int(cfg.get('general', 'autostart')))
 
 		
-		self.chk_enable_filters.set_active(int(cfg.get('filter', 'filter_on')))
-		self.textbuffer_filters.set_text(cfg.get('filter', 'filter_text'))
+		self.chk_enable_filter.set_active(int(cfg.get('filter', 'filter_on')))
+		self.textbuffer_filter.set_text(cfg.get('filter', 'filter_text'))
 
 		self.accounts.load()
 
@@ -149,9 +149,9 @@ class ConfigWindow:
 		autostart = self.chk_autostart.get_active()
 		cfg.set('general', 'autostart', int(autostart))
 
-		cfg.set('filter', 'filter_on', int(self.chk_enable_filters.get_active()))
-		start, end = self.textbuffer_filters.get_bounds()		
-		cfg.set('filter', 'filter_text', self.textbuffer_filters.get_text(start, end, True))	
+		cfg.set('filter', 'filter_on', int(self.chk_enable_filter.get_active()))
+		start, end = self.textbuffer_filter.get_bounds()		
+		cfg.set('filter', 'filter_text', self.textbuffer_filter.get_text(start, end, True))	
 		
 		on, name, server, user, password, imap, folder, port = self.accounts.get_cfg()
 		cfg.set('account', 'on', on)
@@ -293,8 +293,8 @@ class ConfigWindow:
 		self.button_remove.set_sensitive(len(model) > 0)
 
 
-	def __on_chk_enable_filters_toggled(self, widget):
-		self.textview_filters.set_sensitive(self.chk_enable_filters.get_active())
+	def __on_chk_enable_filter_toggled(self, widget):
+		self.textview_filter.set_sensitive(self.chk_enable_filter.get_active())
 
 
 	def __save_and_quit(self):
diff --git a/config_window.ui b/config_window.ui
index 71819e4..78601cb 100644
--- a/config_window.ui
+++ b/config_window.ui
@@ -324,15 +324,15 @@
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkCheckButton" id="chk_enable_filters">
-                <property name="label" translatable="yes">Enable spam filters</property>
+              <object class="GtkCheckButton" id="chk_enable_filter">
+                <property name="label" translatable="yes">Enable spamfilter</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="chk_enable_filters_toggled" swapped="no"/>
+                <signal name="toggled" handler="chk_enable_filter_toggled" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -346,11 +346,11 @@
                 <property name="can_focus">True</property>
                 <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkTextView" id="textview_filters">
+                  <object class="GtkTextView" id="textview_filter">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
-                    <property name="buffer">textbuffer_filters</property>
+                    <property name="buffer">textbuffer_filter</property>
                   </object>
                 </child>
               </object>
@@ -369,7 +369,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Spam Filters</property>
+            <property name="label" translatable="yes">Spamfilter</property>
           </object>
           <packing>
             <property name="position">2</property>
@@ -478,5 +478,5 @@ Copyright (c) 2011 Ralf Hersel</property>
     <signal name="row-deleted" handler="liststore_accounts_row_deleted" swapped="no"/>
     <signal name="row-inserted" handler="liststore_accounts_row_inserted" swapped="no"/>
   </object>
-  <object class="GtkTextBuffer" id="textbuffer_filters"/>
+  <object class="GtkTextBuffer" id="textbuffer_filter"/>
 </interface>