Added key accelerators.

2001-08-15  Jeffrey Stedfast  <fejj@ximian.com>

	* filter.glade: Added key accelerators.

svn path=/trunk/; revision=12157

3 files changed, 52 insertions, 30 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index 7770246fe9..50692b9d61 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,7 +1,12 @@
+2001-08-15  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* filter.glade: Added key accelerators.
+
 2001-08-14  Peter Williams  <peterw@ximian.com>
 
-	* filter-rule.c (xml_decode): Match either "title" or "_title" to allow
-	for translations of the title (provided in the default files)
+	* filter-rule.c (xml_decode): Match either "title" or "_title" to
+	allow for translations of the title (provided in the default
+	files)
 
 2001-08-13  Peter Williams  <peterw@ximian.com>
 
diff --git a/filter/filter.glade b/filter/filter.glade
index 478ed32ad2..7325381317 100644
--- a/filter/filter.glade
+++ b/filter/filter.glade
@@ -162,7 +162,8 @@ Outgoing
 	      <name>rule_add</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>Add</label>
+	      <label>_Add</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -170,7 +171,8 @@ Outgoing
 	      <name>rule_edit</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>Edit</label>
+	      <label>_Edit</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -178,7 +180,8 @@ Outgoing
 	      <name>rule_delete</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>Delete</label>
+	      <label>_Delete</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -187,6 +190,7 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <stock_button>GNOME_STOCK_BUTTON_UP</stock_button>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -195,6 +199,7 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <stock_button>GNOME_STOCK_BUTTON_DOWN</stock_button>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 	  </widget>
 	</widget>
@@ -339,7 +344,8 @@ Outgoing
 	      <name>rule_add</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>Add</label>
+	      <label>_Add</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -347,7 +353,8 @@ Outgoing
 	      <name>rule_edit</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>Edit</label>
+	      <label>_Edit</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -355,7 +362,8 @@ Outgoing
 	      <name>rule_delete</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>Delete</label>
+	      <label>_Delete</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -364,6 +372,7 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <stock_button>GNOME_STOCK_BUTTON_UP</stock_button>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -372,6 +381,7 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <stock_button>GNOME_STOCK_BUTTON_DOWN</stock_button>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 	  </widget>
 	</widget>
@@ -551,7 +561,8 @@ with all local and active remote folders
 		<name>source_add</name>
 		<can_default>True</can_default>
 		<can_focus>True</can_focus>
-		<label>Add</label>
+		<label>_Add</label>
+		<relief>GTK_RELIEF_NORMAL</relief>
 	      </widget>
 
 	      <widget>
@@ -559,7 +570,8 @@ with all local and active remote folders
 		<name>source_remove</name>
 		<can_default>True</can_default>
 		<can_focus>True</can_focus>
-		<label>Remove</label>
+		<label>_Remove</label>
+		<relief>GTK_RELIEF_NORMAL</relief>
 	      </widget>
 	    </widget>
 	  </widget>
@@ -677,7 +689,8 @@ with all local and active remote folders
 	      <name>rule_add</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>Add</label>
+	      <label>_Add</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -685,7 +698,8 @@ with all local and active remote folders
 	      <name>rule_edit</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>Edit</label>
+	      <label>_Edit</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -693,7 +707,8 @@ with all local and active remote folders
 	      <name>rule_delete</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>Delete</label>
+	      <label>_Delete</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -702,6 +717,7 @@ with all local and active remote folders
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <stock_button>GNOME_STOCK_BUTTON_UP</stock_button>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -710,6 +726,7 @@ with all local and active remote folders
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <stock_button>GNOME_STOCK_BUTTON_DOWN</stock_button>
+	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 	  </widget>
 	</widget>
diff --git a/filter/rule-context.c b/filter/rule-context.c
index cf5d13acb7..61e422eeb1 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -75,45 +75,45 @@ rule_context_get_type(void)
 }
 
 static void
-rule_context_class_init(RuleContextClass * class)
+rule_context_class_init (RuleContextClass * class)
 {
 	GtkObjectClass *object_class;
-
+	
 	object_class = (GtkObjectClass *) class;
 	parent_class = gtk_type_class(gtk_object_get_type());
-
+	
 	object_class->finalize = rule_context_finalise;
-
+	
 	/* override methods */
 	class->load = load;
 	class->save = save;
-
+	
 	/* signals */
-
+	
 	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);
 }
 
 static void
-rule_context_init(RuleContext * o)
+rule_context_init (RuleContext * o)
 {
-	o->priv = g_malloc0(sizeof(*o->priv));
-
-	o->part_set_map = g_hash_table_new(g_str_hash, g_str_equal);
-	o->rule_set_map = g_hash_table_new(g_str_hash, g_str_equal);
+	o->priv = g_malloc0 (sizeof (*o->priv));
+	
+	o->part_set_map = g_hash_table_new (g_str_hash, g_str_equal);
+	o->rule_set_map = g_hash_table_new (g_str_hash, g_str_equal);
 }
 
 static void
-free_part_set(struct _part_set_map *map, void *data)
+free_part_set (struct _part_set_map *map, void *data)
 {
-	g_free(map->name);
-	g_free(map);
+	g_free (map->name);
+	g_free (map);
 }
 
 static void
-free_rule_set(struct _rule_set_map *map, void *data)
+free_rule_set (struct _rule_set_map *map, void *data)
 {
-	g_free(map->name);
-	g_free(map);
+	g_free (map->name);
+	g_free (map);
 }
 
 static void