More whitespace cleanup.

13 files changed, 29 insertions, 31 deletions

diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 41b03d7f65..04c163ef06 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -212,7 +212,7 @@ ecb_set_property (GObject *object,
 	item = GNOME_CANVAS_ITEM (object);
 	ecb = E_CANVAS_BACKGROUND (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_FILL_COLOR:
 		if (g_value_get_string (value))
 			gdk_color_parse (g_value_get_string (value), &color);
@@ -288,7 +288,7 @@ ecb_get_property (GObject *object,
 
 	ecb = E_CANVAS_BACKGROUND (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_FILL_COLOR_GDK:
 		g_value_set_boxed (value, gdk_color_copy (&ecb->priv->color));
 		break;
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index a7e8191bc4..af159b2000 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -126,7 +126,7 @@ e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value,
 	item = GNOME_CANVAS_ITEM (object);
 	e_canvas_vbox = E_CANVAS_VBOX (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_WIDTH:
 	case PROP_MINIMUM_WIDTH:
 		e_canvas_vbox->minimum_width = g_value_get_double (value);
@@ -329,7 +329,7 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, gint flags )
 				max_width = item_width;
 			list = g_list_next(list);
 
-			for(; list; list = g_list_next(list)) {
+			for (; list; list = g_list_next(list)) {
 				running_height += e_canvas_vbox->spacing;
 
 				g_object_get (list->data,
diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c
index f482f06094..3caf793611 100644
--- a/widgets/misc/e-combo-button.c
+++ b/widgets/misc/e-combo-button.c
@@ -452,7 +452,7 @@ e_combo_button_pack_hbox (EComboButton *combo_button)
 
 	priv = combo_button->priv;
 
-	if(priv->is_already_packed){
+	if (priv->is_already_packed) {
 		gtk_widget_destroy (priv->hbox);
 	}
 
@@ -487,7 +487,7 @@ e_combo_button_pack_vbox (EComboButton *combo_button)
 
 	priv = combo_button->priv;
 
-	if(priv->is_already_packed){
+	if (priv->is_already_packed) {
 		gtk_widget_destroy (priv->hbox);
 	}
 
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index e8f4221b60..4ec2717d1c 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -80,12 +80,12 @@ create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gch
 	black_color = '.';
 
 	yofs = colors + 1;
-	for (y = 0; y < 32; y++){
-		for (x = 0; x < 32;){
+	for (y = 0; y < 32; y++) {
+		for (x = 0; x < 32;) {
 			gchar value = 0, maskv = 0;
 
-			for (pix = 0; pix < 8; pix++, x++){
-				if (xpm [y + yofs][x] != transparent_color){
+			for (pix = 0; pix < 8; pix++, x++) {
+				if (xpm [y + yofs][x] != transparent_color) {
 					maskv |= 1 << pix;
 
 					/*
@@ -94,7 +94,7 @@ create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gch
 					 * We reverse the foreground & background in the next
 					 * routine to compensate.
 					 */
-					if (xpm [y + yofs][x] == black_color){
+					if (xpm [y + yofs][x] == black_color) {
 						value |= 1 << pix;
 					}
 				}
@@ -114,7 +114,7 @@ e_cursors_init (void)
 
 	e_color_init ();
 
-	for (i = 0; cursors [i].hot_x; i++){
+	for (i = 0; cursors [i].hot_x; i++) {
 		if (cursors [i].hot_x < 0)
 			cursors [i].cursor = gdk_cursor_new (cursors [i].hot_y);
 		else {
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index e7b1a0555e..775ab3b8a3 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -200,7 +200,7 @@ e_date_edit_get_type		(void)
 {
 	static GType date_edit_type = 0;
 
-	if (!date_edit_type){
+	if (!date_edit_type) {
 		static const GTypeInfo date_edit_info =  {
 			sizeof (EDateEditClass),
 			NULL,           /* base_init */
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index 6cd4958127..d33e3c1139 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -50,7 +50,7 @@ e_popup_menu (GtkMenu *menu, GdkEvent *event)
 		else if ((event->type == GDK_BUTTON_PRESS) ||
 			 (event->type == GDK_BUTTON_RELEASE) ||
 			 (event->type == GDK_2BUTTON_PRESS) ||
-			 (event->type == GDK_3BUTTON_PRESS)){
+			 (event->type == GDK_3BUTTON_PRESS)) {
 			gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
 					event->button.button,
 					event->button.time);
diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c
index 90130ccbd6..87b89f61d5 100644
--- a/widgets/misc/e-icon-entry.c
+++ b/widgets/misc/e-icon-entry.c
@@ -393,7 +393,6 @@ e_icon_entry_create_text (const gchar *text)
 	return eventbox;
 }
 
-
 GtkWidget *
 e_icon_entry_create_separator ()
 {
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 129a52e0ca..953d0c67dd 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -53,7 +53,7 @@ make_item (GtkMenu *menu, GtkMenuItem *item, const gchar *name, GtkWidget *pixma
 
 	gtk_container_add (GTK_CONTAINER (item), label);
 
-	if (pixmap && GTK_IS_IMAGE_MENU_ITEM (item)){
+	if (pixmap && GTK_IS_IMAGE_MENU_ITEM (item)) {
 		gtk_widget_show (pixmap);
 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), pixmap);
 	}
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 63e92dbe2b..794e650ea1 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -710,7 +710,7 @@ e_reflow_set_property (GObject *object, guint prop_id, const GValue *value, GPar
 	item = GNOME_CANVAS_ITEM (object);
 	reflow = E_REFLOW (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_HEIGHT:
 		reflow->height = g_value_get_double (value);
 		reflow->need_reflow_columns = TRUE;
@@ -839,7 +839,7 @@ e_reflow_realize (GnomeCanvasItem *item)
 	reflow->default_cursor = gdk_cursor_new (GDK_LEFT_PTR);
 
 	count = reflow->count;
-	for(i = 0; i < count; i++) {
+	for (i = 0; i < count; i++) {
 		if (reflow->items[i])
 			gnome_canvas_item_set(reflow->items[i],
 					      "width", reflow->column_width,
@@ -899,7 +899,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 
 	reflow = E_REFLOW (item);
 
-	switch( event->type )
+	switch ( event->type )
 		{
 		case GDK_KEY_PRESS:
 			return_val = e_selection_model_key_press(reflow->selection, (GdkEventKey *) event);
@@ -946,7 +946,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 			}
 #endif
 		case GDK_BUTTON_PRESS:
-			switch(event->button.button)
+			switch (event->button.button)
 				{
 				case 1:
 					{
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 36e0e6dc52..0a778531b7 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -77,10 +77,10 @@ static void emit_query_changed (ESearchBar *esb);
 static void
 esb_paint_label (GtkWidget *label, gboolean active)
 {
-	static char *sens = NULL;
-	static char *insens = NULL;
-	char *text;
-	
+	static gchar *sens = NULL;
+	static gchar *insens = NULL;
+	gchar *text;
+
 	if (!label)
 		return;
 
@@ -564,7 +564,7 @@ scopeoption_changed_cb (GtkWidget *option_menu, ESearchBar *search_bar)
 	if (!(text && *text))
 		gtk_widget_grab_focus (search_bar->entry);
 
-	if(!search_bar->block_search)
+	if (!search_bar->block_search)
 		emit_query_changed (search_bar);
 
 	g_free (text);
@@ -985,7 +985,6 @@ idle_activate_hack (gpointer ptr)
 	return FALSE;
 }
 
-
 void
 e_search_bar_construct (ESearchBar *search_bar,
 			ESearchBarItem *menu_items,
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index 84a18eb925..9a2a6a8e68 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -194,7 +194,7 @@ esma_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_CURSOR_ROW:
 		g_value_set_int (value, esma->cursor_row);
 		break;
@@ -211,7 +211,7 @@ esma_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 	ESelectionModel *esm = E_SELECTION_MODEL (object);
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_CURSOR_ROW:
 		e_selection_model_do_something(esm, g_value_get_int (value), esma->cursor_col, 0);
 		break;
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index cc1d3b3780..fb43d73ffb 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -84,7 +84,7 @@ esm_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp
 {
 	ESelectionModel *esm = E_SELECTION_MODEL (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_SORTER:
 		g_value_set_object (value, esm->sorter);
 		break;
@@ -104,7 +104,7 @@ esm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpe
 {
 	ESelectionModel *esm = E_SELECTION_MODEL (object);
 
-	switch (prop_id){
+	switch (prop_id) {
 	case PROP_SORTER:
 		drop_sorter(esm);
 		add_sorter(esm, g_value_get_object (value) ? E_SORTER(g_value_get_object(value)) : NULL);
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index eff79544fd..aa6c41e6d2 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -249,7 +249,7 @@ sensitize_widgets (ESendOptionsDialog *sod)
 	if (!gopts->expiration_enabled)
 		gtk_widget_set_sensitive (priv->expire_after, FALSE);
 
-	if (!gopts->delay_enabled){
+	if (!gopts->delay_enabled) {
 		gtk_widget_set_sensitive (priv->delay_until, FALSE);
 	}