Miscellaneous cleanups.

8 files changed, 23 insertions, 23 deletions

diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 1642ea5ea7..d933e1ae82 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -126,7 +126,7 @@ epech_get_widgets (CustomHeaderOptionsDialog *mch)
 	if (!priv->main)
 		return FALSE;
 
-	priv->page  = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");
+	priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");
 	priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");
 #undef EMAIL_CUSTOM_HEADER
 
@@ -219,7 +219,7 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch,
 	}
 
 	epech_setup_widgets (mch);
-	toplevel =  gtk_widget_get_toplevel (priv->main);
+	toplevel = gtk_widget_get_toplevel (priv->main);
 
 	if (parent)
 		gtk_window_set_transient_for (GTK_WINDOW (toplevel),GTK_WINDOW (parent));
@@ -240,7 +240,7 @@ epech_load_from_settings (GSettings *settings,
 {
 	CustomHeaderOptionsDialogPrivate *priv;
 	EmailCustomHeaderDetails temp_header_details= {-1, -1, NULL, NULL};
-	CustomSubHeader temp_header_value_details =  {NULL};
+	CustomSubHeader temp_header_value_details = {NULL};
 	gchar **headers;
 	gint index,pos;
 
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index bb2eed56d8..f374e46e0b 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -136,12 +136,12 @@ send_dbus_message (const gchar *name,
 		g_variant_builder_add (builder, "(u)", new_count);
 	}
 
-	#define add_named_param(name, value)				\
-		if (value) {						\
-			gchar *val;					\
-			val = g_strconcat (name, ":", value, NULL);	\
-			g_variant_builder_add (builder, "(s)", val);	\
-			g_free (val);					\
+	#define add_named_param(name, value) \
+		if (value) { \
+			gchar *val; \
+			val = g_strconcat (name, ":", value, NULL); \
+			g_variant_builder_add (builder, "(s)", val); \
+			g_free (val); \
 		}
 
 	add_named_param ("msg_uid", msg_uid);
@@ -431,7 +431,7 @@ new_notify_status (EMEventTargetFolder *t)
 		if (!notify_init ("evolution-mail-notification"))
 			fprintf (stderr,"notify init error");
 
-		notify  = notify_notification_new (
+		notify = notify_notification_new (
 			summary, escaped_text, icon_name);
 
 		notify_notification_set_urgency (
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index a93848c850..71105d8fd6 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -871,10 +871,10 @@ do_mail_to_event (AsyncData *data)
 		struct icaltimetype tt, tt2;
 		struct _manage_comp *oldmc = NULL;
 
-		#define cache_backend_prop(prop) {							\
-			gchar *val = NULL;								\
-			e_client_get_backend_property_sync (E_CLIENT (client), prop, &val, NULL, NULL);	\
-			g_free (val);									\
+		#define cache_backend_prop(prop) { \
+			gchar *val = NULL; \
+			e_client_get_backend_property_sync (E_CLIENT (client), prop, &val, NULL, NULL); \
+			g_free (val); \
 		}
 
 		/* precache backend properties, thus editor have them ready when needed */
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index fcaa5098fe..b108cf7590 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -144,7 +144,7 @@ update_publish_notification (GtkMessageType msg_type,
 				return;
 			}
 
-			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, icon_name);
+			notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, icon_name);
 			notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
 			notify_notification_set_hint (
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index dfbbe69413..582e85d2cb 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -53,9 +53,9 @@ create_uri (UrlEditorDialog *dialog)
 		const gchar *method = "file";
 		gchar *server, *file, *port, *username, *password;
 
-		server   = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry)));
-		file     = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->file_entry)));
-		port     = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->port_entry)));
+		server = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry)));
+		file = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->file_entry)));
+		port = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->port_entry)));
 		username = g_uri_escape_string (gtk_entry_get_text (GTK_ENTRY (dialog->username_entry)), "", FALSE);
 		password = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->password_entry)));
 
@@ -105,7 +105,7 @@ create_uri (UrlEditorDialog *dialog)
 	}
 
 	uri->fb_duration_value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (dialog->fb_duration_spin));
-	uri->fb_duration_type  = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->fb_duration_combo));
+	uri->fb_duration_type = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->fb_duration_combo));
 }
 
 static void
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index e720f71729..990c27b70a 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -151,7 +151,7 @@ add_time_to_csv (GString *line,
 
 	if (time) {
 		gboolean needquotes = FALSE;
-		struct tm mytm =  icaltimetype_to_tm (time);
+		struct tm mytm = icaltimetype_to_tm (time);
 		gchar *str = (gchar *) g_malloc (sizeof (gchar) * 200);
 
 		/* Translators: the %F %T is the third argument for a
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 49eb365d9b..f89b770e5f 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -135,7 +135,7 @@ add_time_to_rdf (xmlNodePtr node,
 {
 	if (time) {
 		xmlNodePtr cur_node = NULL;
-		struct tm mytm =  icaltimetype_to_tm (time);
+		struct tm mytm = icaltimetype_to_tm (time);
 		gchar *str = (gchar *) g_malloc (sizeof (gchar) * 200);
 		gchar *tmp = NULL;
 		gchar *timezone;
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index fbe20d0adc..358a683dce 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -687,7 +687,7 @@ fill_template (CamelMimeMessage *message,
 			}
 		}
 	 } else
-		message_part  = CAMEL_MIME_PART (message);
+		message_part = CAMEL_MIME_PART (message);
 
 	/* Get content of the template */
 	stream = camel_stream_mem_new ();
@@ -1318,7 +1318,7 @@ update_actions_cb (EShellView *shell_view,
 	length = g_list_length (list);
 
 	if (!length) {
-		EShellWindow *shell_window  = e_shell_view_get_shell_window (shell_view);
+		EShellWindow *shell_window = e_shell_view_get_shell_window (shell_view);
 		build_menu (shell_window, action_group);
 	}