** Remove trailing whitespace from source code.

2007-11-14  Matthew Barnes  <mbarnes@redhat.com>

	** Remove trailing whitespace from source code.


svn path=/trunk/; revision=34537

1 files changed, 68 insertions, 68 deletions

diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 1815e0dcdb..aaec41ba3b 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -52,7 +52,7 @@ GType
 em_filter_rule_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EMFilterRuleClass),
@@ -65,10 +65,10 @@ em_filter_rule_get_type(void)
 			0,    /* n_preallocs */
 			(GInstanceInitFunc)em_filter_rule_init,
 		};
-		
+
 		type = g_type_register_static(FILTER_TYPE_RULE, "EMFilterRule", &info, 0);
 	}
-	
+
 	return type;
 }
 
@@ -77,11 +77,11 @@ em_filter_rule_class_init(EMFilterRuleClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS(klass);
 	FilterRuleClass *fr_class =(FilterRuleClass *)klass;
-	
+
 	parent_class = g_type_class_ref(FILTER_TYPE_RULE);
-	
+
 	object_class->finalize = em_filter_rule_finalise;
-	
+
 	/* override methods */
 	fr_class->validate = validate;
 	fr_class->eq = filter_eq;
@@ -111,10 +111,10 @@ static void
 em_filter_rule_finalise(GObject *obj)
 {
 	EMFilterRule *ff =(EMFilterRule *) obj;
-	
+
 	unref_list(ff->actions);
 	g_list_free(ff->actions);
-	
+
         G_OBJECT_CLASS(parent_class)->finalize(obj);
 }
 
@@ -122,7 +122,7 @@ em_filter_rule_finalise(GObject *obj)
  * em_filter_rule_new:
  *
  * Create a new EMFilterRule object.
- * 
+ *
  * Return value: A new #EMFilterRule object.
  **/
 EMFilterRule *
@@ -135,7 +135,7 @@ void
 em_filter_rule_add_action(EMFilterRule *fr, FilterPart *fp)
 {
 	fr->actions = g_list_append(fr->actions, fp);
-	
+
 	filter_rule_emit_changed((FilterRule *)fr);
 }
 
@@ -143,7 +143,7 @@ void
 em_filter_rule_remove_action(EMFilterRule *fr, FilterPart *fp)
 {
 	fr->actions = g_list_remove(fr->actions, fp);
-	
+
 	filter_rule_emit_changed((FilterRule *)fr);
 }
 
@@ -151,14 +151,14 @@ void
 em_filter_rule_replace_action(EMFilterRule *fr, FilterPart *fp, FilterPart *new)
 {
 	GList *l;
-	
+
 	l = g_list_find(fr->actions, fp);
 	if (l) {
 		l->data = new;
 	} else {
 		fr->actions = g_list_append(fr->actions, new);
 	}
-	
+
 	filter_rule_emit_changed((FilterRule *)fr);
 }
 
@@ -176,16 +176,16 @@ validate(FilterRule *fr)
 	EMFilterRule *ff =(EMFilterRule *)fr;
 	GList *parts;
 	int valid;
-	
+
         valid = FILTER_RULE_CLASS(parent_class)->validate(fr);
-	
+
 	/* validate rule actions */
 	parts = ff->actions;
 	while (parts && valid) {
 		valid = filter_part_validate((FilterPart *)parts->data);
 		parts = parts->next;
 	}
-	
+
 	return valid;
 }
 
@@ -193,15 +193,15 @@ static int
 list_eq(GList *al, GList *bl)
 {
 	int truth = TRUE;
-	
+
 	while (truth && al && bl) {
 		FilterPart *a = al->data, *b = bl->data;
-		
+
 		truth = filter_part_eq(a, b);
 		al = al->next;
 		bl = bl->next;
 	}
-	
+
 	return truth && al == NULL && bl == NULL;
 }
 
@@ -218,7 +218,7 @@ xml_encode(FilterRule *fr)
 	EMFilterRule *ff =(EMFilterRule *)fr;
 	xmlNodePtr node, set, work;
 	GList *l;
-	
+
         node = FILTER_RULE_CLASS(parent_class)->xml_encode(fr);
 	g_return_val_if_fail (node != NULL, NULL);
 	set = xmlNewNode(NULL, (const unsigned char *)"actionset");
@@ -229,7 +229,7 @@ xml_encode(FilterRule *fr)
 		xmlAddChild(set, work);
 		l = l->next;
 	}
-	
+
 	return node;
 
 }
@@ -240,7 +240,7 @@ load_set(xmlNodePtr node, EMFilterRule *ff, RuleContext *rc)
 	xmlNodePtr work;
 	char *rulename;
 	FilterPart *part;
-	
+
 	work = node->children;
 	while (work) {
 		if (!strcmp((char *)work->name, "part")) {
@@ -267,11 +267,11 @@ xml_decode(FilterRule *fr, xmlNodePtr node, RuleContext *rc)
 	EMFilterRule *ff =(EMFilterRule *)fr;
 	xmlNodePtr work;
 	int result;
-	
+
         result = FILTER_RULE_CLASS(parent_class)->xml_decode(fr, node, rc);
 	if (result != 0)
 		return result;
-	
+
 	work = node->children;
 	while (work) {
 		if (!strcmp((char *)work->name, "actionset")) {
@@ -279,7 +279,7 @@ xml_decode(FilterRule *fr, xmlNodePtr node, RuleContext *rc)
 		}
 		work = work->next;
 	}
-	
+
 	return 0;
 }
 
@@ -288,25 +288,25 @@ rule_copy(FilterRule *dest, FilterRule *src)
 {
 	EMFilterRule *fdest, *fsrc;
 	GList *node;
-	
+
 	fdest =(EMFilterRule *)dest;
 	fsrc =(EMFilterRule *)src;
-	
+
 	if (fdest->actions) {
 		g_list_foreach(fdest->actions, (GFunc)g_object_unref, NULL);
 		g_list_free(fdest->actions);
 		fdest->actions = NULL;
 	}
-	
+
 	node = fsrc->actions;
 	while (node) {
 		FilterPart *part = node->data;
-		
+
 		g_object_ref(part);
 		fdest->actions = g_list_append(fdest->actions, part);
 		node = node->next;
 	}
-	
+
 	FILTER_RULE_CLASS(parent_class)->copy(dest, src);
 }
 
@@ -327,16 +327,16 @@ option_activate(GtkMenuItem *item, struct _part_data *data)
 {
 	FilterPart *part = g_object_get_data((GObject *)item, "part");
 	FilterPart *newpart;
-	
+
 	/* dont update if we haven't changed */
 	if (!strcmp(part->title, data->part->title))
 		return;
-	
+
 	/* here we do a widget shuffle, throw away the old widget/rulepart,
 	   and create another */
 	if (data->partwidget)
 		gtk_container_remove(GTK_CONTAINER(data->container), data->partwidget);
-	
+
 	newpart = filter_part_clone(part);
 	filter_part_copy_values(newpart, data->part);
 	em_filter_rule_replace_action((EMFilterRule *)data->fr, data->part, newpart);
@@ -345,7 +345,7 @@ option_activate(GtkMenuItem *item, struct _part_data *data)
 	data->partwidget = filter_part_get_widget(newpart);
 	if (data->partwidget)
 		gtk_box_pack_start(GTK_BOX(data->container), data->partwidget, TRUE, TRUE, 0);
-	
+
 	g_object_set_data((GObject *)data->container, "part", newpart);
 }
 
@@ -360,44 +360,44 @@ get_rule_part_widget(EMFilterContext *f, FilterPart *newpart, FilterRule *fr)
 	GtkWidget *p;
 	int index = 0, current = 0;
 	struct _part_data *data;
-	
+
 	data = g_malloc0(sizeof(*data));
 	data->fr = fr;
 	data->f = f;
 	data->part = newpart;
-	
+
 	hbox = gtk_hbox_new(FALSE, 0);
 	p = filter_part_get_widget(newpart);
-	
+
 	data->partwidget = p;
 	data->container = hbox;
-	
+
 	menu = gtk_menu_new();
 	while ((part = em_filter_context_next_action(f, part))) {
 		item = gtk_menu_item_new_with_label(_(part->title));
-		
+
 		g_object_set_data((GObject *)item, "part", part);
 		g_signal_connect(item, "activate", G_CALLBACK(option_activate), data);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 		gtk_widget_show(item);
-		
+
 		if (!strcmp(newpart->title, part->title))
 			current = index;
-		
+
 		index++;
 	}
-	
+
 	omenu = gtk_option_menu_new();
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(omenu), menu);
 	gtk_option_menu_set_history(GTK_OPTION_MENU(omenu), current);
 	gtk_widget_show(omenu);
-	
+
 	gtk_box_pack_start(GTK_BOX(hbox), omenu, FALSE, FALSE, 0);
 	if (p)
 		gtk_box_pack_start(GTK_BOX(hbox), p, TRUE, TRUE, 0);
-	
+
 	gtk_widget_show_all(hbox);
-	
+
 	return hbox;
 }
 
@@ -413,18 +413,18 @@ less_parts(GtkWidget *button, struct _rule_data *data)
 	FilterPart *part;
 	GtkWidget *rule;
 	GList *l;
-	
+
 	l =((EMFilterRule *)data->fr)->actions;
 	if (g_list_length(l) < 2)
 		return;
-	
+
 	rule = g_object_get_data((GObject *)button, "rule");
 	part = g_object_get_data((GObject *)rule, "part");
-	
+
 	/* remove the part from the list */
 	em_filter_rule_remove_action((EMFilterRule *)data->fr, part);
 	g_object_unref(part);
-	
+
 	/* and from the display */
 	gtk_container_remove(GTK_CONTAINER(data->parts), rule);
 	gtk_container_remove(GTK_CONTAINER(data->parts), button);
@@ -434,10 +434,10 @@ static void
 attach_rule(GtkWidget *rule, struct _rule_data *data, FilterPart *part, int row)
 {
 	GtkWidget *remove;
-	
+
 	gtk_table_attach(GTK_TABLE(data->parts), rule, 0, 1, row, row + 1,
 			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	
+
 	remove = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
 	g_object_set_data((GObject *)remove, "rule", rule);
 	g_object_set_data((GObject *)rule, "part", part);
@@ -452,17 +452,17 @@ static void
 more_parts(GtkWidget *button, struct _rule_data *data)
 {
 	FilterPart *new;
-	
+
 	/* create a new rule entry, use the first type of rule */
 	new = em_filter_context_next_action((EMFilterContext *)data->f, NULL);
 	if (new) {
 		GtkWidget *w;
 		guint16 rows;
-		
+
 		new = filter_part_clone(new);
 		em_filter_rule_add_action((EMFilterRule *)data->fr, new);
 		w = get_rule_part_widget(data->f, new, data->fr);
-		
+
 		rows = GTK_TABLE(data->parts)->nrows;
 		gtk_table_resize(GTK_TABLE(data->parts), rows + 1, 2);
 		attach_rule(w, data, new, rows);
@@ -482,11 +482,11 @@ get_widget(FilterRule *fr, RuleContext *rc)
 	EMFilterRule *ff =(EMFilterRule *)fr;
 	int rows, i = 0;
 	gchar *msg;
-	
+
         widget = FILTER_RULE_CLASS(parent_class)->get_widget(fr, rc);
-	
+
 	/* and now for the action area */
-	msg = g_strdup_printf("<b>%s</b>", _("Then"));	
+	msg = g_strdup_printf("<b>%s</b>", _("Then"));
 	label = gtk_label_new(msg);
 	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -504,24 +504,24 @@ get_widget(FilterRule *fr, RuleContext *rc)
 
 	inframe = gtk_vbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(hbox), inframe, TRUE, TRUE, 0);
-	
+
 	rows = g_list_length(ff->actions);
 	parts = gtk_table_new(rows, 2, FALSE);
 	data = g_malloc0(sizeof(*data));
 	data->f =(EMFilterContext *)rc;
 	data->fr = fr;
 	data->parts = parts;
-	
+
 	hbox = gtk_hbox_new(FALSE, 3);
-	
+
 	add = gtk_button_new_with_mnemonic (_("Add Ac_tion"));
 	gtk_button_set_image (GTK_BUTTON (add), gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON));
 	/* gtk_button_set_relief(GTK_BUTTON(add), GTK_RELIEF_NONE); */
 	g_signal_connect(add, "clicked", G_CALLBACK(more_parts), data);
 	gtk_box_pack_start(GTK_BOX(hbox), add, FALSE, FALSE, 0);
-	
+
 	gtk_box_pack_start(GTK_BOX(inframe), hbox, FALSE, FALSE, 3);
-	
+
 	l = ff->actions;
 	while (l) {
 		part = l->data;
@@ -530,20 +530,20 @@ get_widget(FilterRule *fr, RuleContext *rc)
 		attach_rule(w, data, part, i++);
 		l = l->next;
 	}
-	
+
 	hadj = gtk_adjustment_new(0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);
 	vadj = gtk_adjustment_new(0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);
 	scrolledwindow = gtk_scrolled_window_new(GTK_ADJUSTMENT(hadj), GTK_ADJUSTMENT(vadj));
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),
                                         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	
+
 	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledwindow), parts);
-	
+
 	gtk_box_pack_start(GTK_BOX(inframe), scrolledwindow, TRUE, TRUE, 0);
-	
+
 	/*gtk_box_pack_start(GTK_BOX(inframe), parts, FALSE, FALSE, 3);*/
-	
+
 	gtk_widget_show_all(widget);
-	
+
 	return widget;
 }