24 files changed, 29 insertions, 29 deletions
diff --git a/filter/filter-code.c b/filter/filter-code.c
index 1de9c3aba6..fb0880b260 100644
--- a/filter/filter-code.c
+++ b/filter/filter-code.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-code.h b/filter/filter-code.h
index 7199bcef68..38336fc450 100644
--- a/filter/filter-code.h
+++ b/filter/filter-code.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-colour.c b/filter/filter-colour.c
index 0d0388de94..a5cc3534ad 100644
--- a/filter/filter-colour.c
+++ b/filter/filter-colour.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-colour.h b/filter/filter-colour.h
index 1de46ab70b..ff19d66686 100644
--- a/filter/filter-colour.h
+++ b/filter/filter-colour.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index cf92b804f5..d0a7b591a5 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h
index cbb79a46c5..c8eee1bae7 100644
--- a/filter/filter-datespec.h
+++ b/filter/filter-datespec.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-element.c b/filter/filter-element.c
index c14365cc8a..1fa0a14ee8 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-element.h b/filter/filter-element.h
index 6124b364a2..76894542a2 100644
--- a/filter/filter-element.h
+++ b/filter/filter-element.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-file.c b/filter/filter-file.c
index 4126c4b937..2c0ac87c7f 100644
--- a/filter/filter-file.c
+++ b/filter/filter-file.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -208,7 +208,7 @@ xml_encode (FilterElement *fe)
 {
 	FilterFile *file = (FilterFile *) fe;
 	xmlNodePtr cur, value;
-	char *type;
+	const gchar *type;
 
 	type = file->type ? file->type : "file";
 
diff --git a/filter/filter-file.h b/filter/filter-file.h
index 81e6b8c1cd..02dabdb2e8 100644
--- a/filter/filter-file.h
+++ b/filter/filter-file.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-input.c b/filter/filter-input.c
index be88a06835..30d6ed9c45 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -237,7 +237,7 @@ xml_encode (FilterElement *fe)
 	xmlNodePtr value;
 	GList *l;
 	FilterInput *fi = (FilterInput *)fe;
-	char *type;
+	const gchar *type;
 
 	type = fi->type ? fi->type : "string";
 
diff --git a/filter/filter-input.h b/filter/filter-input.h
index b6c6019052..ac71847a76 100644
--- a/filter/filter-input.h
+++ b/filter/filter-input.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-int.c b/filter/filter-int.c
index 969a477331..170657e2dd 100644
--- a/filter/filter-int.c
+++ b/filter/filter-int.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-int.h b/filter/filter-int.h
index 06add3fd05..60e1b2bf85 100644
--- a/filter/filter-int.h
+++ b/filter/filter-int.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-option.c b/filter/filter-option.c
index 7c5bbe901c..f4b208c59d 100644
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-option.h b/filter/filter-option.h
index 6cf56645b8..8a4931a009 100644
--- a/filter/filter-option.h
+++ b/filter/filter-option.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 08434eadac..799e7fcb36 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-part.h b/filter/filter-part.h
index 6c83b1d734..1827433b1c 100644
--- a/filter/filter-part.h
+++ b/filter/filter-part.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 7972de13d0..cdc9f374f1 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -635,7 +635,7 @@ part_combobox_changed (GtkComboBox *combobox, struct _part_data *data)
 
 	g_return_if_fail (part != NULL);
 	g_return_if_fail (i == index);
-	
+
 	/* dont update if we haven't changed */
 	if (!strcmp (part->title, data->part->title))
 		return;
@@ -809,7 +809,7 @@ more_parts (GtkWidget *button, struct _rule_data *data)
 			adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w));
 			if (adjustment)
 				gtk_adjustment_set_value (adjustment, adjustment->upper);
-				
+
 		}
 	}
 }
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
index b1683e1c8b..24419fec09 100644
--- a/filter/filter-rule.h
+++ b/filter/filter-rule.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/rule-context.c b/filter/rule-context.c
index 0a7438b12c..4bd364f0b8 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/rule-context.h b/filter/rule-context.h
index ba7e47c381..539c5b3b56 100644
--- a/filter/rule-context.h
+++ b/filter/rule-context.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index dc4c65a24c..07ea3fd1e4 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -639,7 +639,7 @@ rule_bottom (GtkWidget *widget, RuleEditor *re)
 }
 
 static struct {
-	char *name;
+	const gchar *name;
 	GCallback func;
 } edit_buttons[] = {
 	{ "rule_add",    G_CALLBACK (rule_add)    },
diff --git a/filter/rule-editor.h b/filter/rule-editor.h
index 555b5e8263..40cc90ef90 100644
--- a/filter/rule-editor.h
+++ b/filter/rule-editor.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors: