Coding style and whitespace cleanup.

12 files changed, 301 insertions, 137 deletions

diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index dc21a7bbb9..3bdd60a1b7 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -123,19 +123,32 @@ typedef struct {
 static gpointer midnight_refresh_id = NULL;
 static time_t midnight = 0;
 
-static void
-remove_client_alarms (ClientAlarms *ca);
-static void display_notification (time_t trigger, CompQueuedAlarms *cqa,
-				  gpointer alarm_id, gboolean use_description);
-static void audio_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-static void mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
-static void procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
+static void	remove_client_alarms		(ClientAlarms *ca);
+static void	display_notification		(time_t trigger,
+						 CompQueuedAlarms *cqa,
+						 gpointer alarm_id,
+						 gboolean use_description);
+static void	audio_notification		(time_t trigger,
+						 CompQueuedAlarms *cqa,
+						 gpointer alarm_id);
+static void	mail_notification		(time_t trigger,
+						 CompQueuedAlarms *cqa,
+						 gpointer alarm_id);
+static void	procedure_notification		(time_t trigger,
+						 CompQueuedAlarms *cqa,
+						 gpointer alarm_id);
 #ifdef HAVE_LIBNOTIFY
-static void popup_notification (time_t trigger, CompQueuedAlarms *cqa,
-				  gpointer alarm_id, gboolean use_description);
+static void	popup_notification		(time_t trigger,
+						 CompQueuedAlarms *cqa,
+						 gpointer alarm_id,
+						 gboolean use_description);
 #endif
-static void query_objects_changed_cb (ECal *client, GList *objects, gpointer data);
-static void query_objects_removed_cb (ECal *client, GList *objects, gpointer data);
+static void	query_objects_changed_cb	(ECal *client,
+						 GList *objects,
+						 gpointer data);
+static void	query_objects_removed_cb	(ECal *client,
+						 GList *objects,
+						 gpointer data);
 
 static void update_cqa (CompQueuedAlarms *cqa, ECalComponent *comp);
 static void update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa);
@@ -196,7 +209,9 @@ e_ctime (const time_t *timep)
 	ret = buffer[next++] = g_strdup (ctime (timep));
 	if (buffer[next - 1] && *buffer[next - 1]) {
 		gint len = strlen (buffer[next - 1]);
-		while (len > 0 && (buffer[next - 1][len - 1] == '\n' || buffer[next - 1][len - 1] == '\r' || g_ascii_isspace (buffer[next - 1][len - 1])))
+		while (len > 0 && (buffer[next - 1][len - 1] == '\n' ||
+			buffer[next - 1][len - 1] == '\r' ||
+			g_ascii_isspace (buffer[next - 1][len - 1])))
 			len--;
 
 		buffer[next - 1][len - 1] = 0;
@@ -485,20 +500,16 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 		ECalComponentAlarmInstance *instance;
 		gpointer alarm_id;
 		QueuedAlarm *qa;
-		time_t tnow = time (NULL);
 
 		instance = l->data;
 
-		if (!has_known_notification (cqa->alarms->comp, instance->auid)) {
-			g_debug ("Could not recognize alarm's notification type, discarding.");
+		if (!has_known_notification (cqa->alarms->comp, instance->auid))
 			continue;
-		}
 
-		alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
-		if (!alarm_id) {
-			debug (("Could not schedule a trigger for %s. Discarding", e_ctime (&(instance->trigger))));
+		alarm_id = alarm_add (
+			instance->trigger, alarm_trigger_cb, cqa, NULL);
+		if (!alarm_id)
 			continue;
-		}
 
 		qa = g_new (QueuedAlarm, 1);
 		qa->alarm_id = alarm_id;
@@ -507,7 +518,6 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 		qa->snooze = FALSE;
 
 		cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
-		debug (("Adding alarm %p %p at %s %s", qa, alarm_id, e_ctime (&(instance->trigger)), e_ctime (&tnow)));
 	}
 
 	id = e_cal_component_get_id (alarms->comp);
@@ -545,15 +555,17 @@ load_alarms (ClientAlarms *ca, time_t start, time_t end)
 		return;
 	}
 
-	str_query = g_strdup_printf ("(has-alarms-in-range? (make-time \"%s\") (make-time \"%s\"))",
-				     iso_start, iso_end);
+	str_query = g_strdup_printf (
+		"(has-alarms-in-range? (make-time \"%s\") "
+		"(make-time \"%s\"))", iso_start, iso_end);
 	g_free (iso_start);
 	g_free (iso_end);
 
 	/* create the live query */
 	if (ca->query) {
 		debug (("Disconnecting old queries"));
-		g_signal_handlers_disconnect_matched (ca->query, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, ca);
+		g_signal_handlers_disconnect_matched (
+			ca->query, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, ca);
 		g_object_unref (ca->query);
 		ca->query = NULL;
 	}
@@ -564,12 +576,15 @@ load_alarms (ClientAlarms *ca, time_t start, time_t end)
 	} else {
 		debug (("Setting Call backs"));
 
-		g_signal_connect (G_OBJECT (ca->query), "objects_added",
-				  G_CALLBACK (query_objects_changed_cb), ca);
-		g_signal_connect (G_OBJECT (ca->query), "objects_modified",
-				  G_CALLBACK (query_objects_changed_cb), ca);
-		g_signal_connect (G_OBJECT (ca->query), "objects_removed",
-				  G_CALLBACK (query_objects_removed_cb), ca);
+		g_signal_connect (
+			ca->query, "objects_added",
+			G_CALLBACK (query_objects_changed_cb), ca);
+		g_signal_connect (
+			ca->query, "objects_modified",
+			G_CALLBACK (query_objects_changed_cb), ca);
+		g_signal_connect (
+			ca->query, "objects_removed",
+			G_CALLBACK (query_objects_removed_cb), ca);
 
 		e_cal_view_start (ca->query);
 	}
@@ -610,7 +625,6 @@ cal_opened_cb (ECal *client, const GError *error, gpointer data)
 
 	ca = data;
 
-	debug (("Opened Calendar %p (Status %d%s%s%s)", client, error ? error->code : 0, error ? " (" : "", error ? error->message : "", error ? ")" : ""));
 	if (error)
 		return;
 
@@ -767,7 +781,8 @@ query_objects_changed_async (struct _query_msg *msg)
 		}
 
 		debug (("Alarm Already Exist for %s", id->uid));
-		/* if the alarms or the alarms list is empty remove it after updating the cqa structure */
+		/* If the alarms or the alarms list is empty,
+		 * remove it after updating the cqa structure. */
 		if (alarms == NULL || alarms->alarms == NULL) {
 
 			/* update the cqa and its queued alarms for changes in summary and alarm_uid  */
@@ -1075,7 +1090,8 @@ tray_list_remove_cqa_async (struct _tray_cqa_msg *msg)
 			debug (("Found"));
 			tray_icons_list = g_list_delete_link (tray_icons_list, tmp);
 			if (alarm_notifications_dialog) {
-				model = gtk_tree_view_get_model (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
+				model = gtk_tree_view_get_model (
+					GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
 				gtk_list_store_remove (GTK_LIST_STORE (model), &(tray_data->iter));
 			}
 			free_tray_icon_data (tray_data);
@@ -1091,11 +1107,14 @@ tray_list_remove_cqa_async (struct _tray_cqa_msg *msg)
 			alarm_notifications_dialog = NULL;
 		} else {
 			GtkTreeIter iter;
-			GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
+			GtkTreeModel *model;
 			GtkTreeSelection *sel;
 
+			model = gtk_tree_view_get_model (
+				GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
 			gtk_tree_model_get_iter_first (model, &iter);
-			sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
+			sel = gtk_tree_view_get_selection (
+				GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
 			gtk_tree_selection_select_iter (sel, &iter);
 		}
 	}
@@ -1133,7 +1152,9 @@ tray_list_remove_async (Message *msg)
 			tray_icons_list = g_list_remove_link (tray_icons_list, list);
 			status = remove_queued_alarm (tray_data->cqa, tray_data->alarm_id, FALSE, TRUE);
 			if (status) {
-				g_hash_table_remove (tray_data->cqa->parent_client->uid_alarms_hash, tray_data->cqa->id);
+				g_hash_table_remove (
+					tray_data->cqa->parent_client->uid_alarms_hash,
+					tray_data->cqa->id);
 				e_cal_component_free_id (tray_data->cqa->id);
 				g_free (tray_data->cqa);
 			}
@@ -1241,7 +1262,10 @@ notify_dialog_cb (AlarmNotifyResult result, gint snooze_mins, gpointer data)
 
 	case ALARM_NOTIFY_DISMISS:
 		if (alarm_notifications_dialog) {
-			GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
+			GtkTreeModel *model;
+
+			model = gtk_tree_view_get_model (
+				GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
 			gtk_list_store_remove (GTK_LIST_STORE (model), &tray_data->iter);
 		}
 		break;
@@ -1520,7 +1544,10 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	if (g_list_length (tray_icons_list) > 1) {
 		gchar *tip;
 
-		tip =  g_strdup_printf (ngettext ("You have %d alarm", "You have %d alarms", g_list_length (tray_icons_list)), g_list_length (tray_icons_list));
+		tip =  g_strdup_printf (ngettext (
+			"You have %d alarm", "You have %d alarms",
+			g_list_length (tray_icons_list)),
+			g_list_length (tray_icons_list));
 		gtk_status_icon_set_tooltip_text (tray_icon, tip);
 	}
 	else {
@@ -1599,15 +1626,23 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 
 	if (organiser.cn) {
 		if (location)
-			body = g_strdup_printf ("<b>%s</b>\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str);
+			body = g_strdup_printf (
+				"<b>%s</b>\n%s %s\n%s %s",
+				organiser.cn, _("Location:"),
+				location, start_str, time_str);
 		else
-			body = g_strdup_printf ("<b>%s</b>\n%s %s", organiser.cn, start_str, time_str);
+			body = g_strdup_printf (
+				"<b>%s</b>\n%s %s",
+				organiser.cn, start_str, time_str);
 	}
 	else {
 		if (location)
-			body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str);
+			body = g_strdup_printf (
+				"%s %s\n%s %s", _("Location:"),
+				location, start_str, time_str);
 		else
-			body = g_strdup_printf ("%s %s", start_str, time_str);
+			body = g_strdup_printf (
+				"%s %s", start_str, time_str);
 	}
 
 #ifdef HAVE_LIBNOTIFY_07
@@ -1759,7 +1794,8 @@ procedure_notification_dialog (const gchar *cmd, const gchar *url)
 
 	/* Run the dialog */
 	btn = gtk_dialog_run (GTK_DIALOG (dialog));
-	if (btn == GTK_RESPONSE_OK && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))
+	if (btn == GTK_RESPONSE_OK &&
+		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))
 		config_data_save_blessed_program (url);
 	gtk_widget_destroy (dialog);
 
@@ -1937,7 +1973,8 @@ alarm_queue_done (void)
 
 	debug (("..."));
 
-	g_hash_table_foreach_remove (client_alarms_hash, (GHRFunc) free_client_alarms_cb, NULL);
+	g_hash_table_foreach_remove (
+		client_alarms_hash, (GHRFunc) free_client_alarms_cb, NULL);
 	g_hash_table_destroy (client_alarms_hash);
 	client_alarms_hash = NULL;
 
@@ -2007,7 +2044,8 @@ alarm_queue_add_async (struct _alarm_client_msg *msg)
 
 	g_hash_table_insert (client_alarms_hash, client, ca);
 
-	ca->uid_alarms_hash = g_hash_table_new ((GHashFunc) hash_ids, (GEqualFunc) compare_ids);
+	ca->uid_alarms_hash = g_hash_table_new (
+		(GHashFunc) hash_ids, (GEqualFunc) compare_ids);
 
 	if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED) {
 		load_alarms_for_today (ca);
@@ -2160,8 +2198,8 @@ alarm_queue_remove_client (ECal *client, gboolean immediately)
 		message_push ((Message *) msg);
 }
 
-/* Update non-time related variables for various structures on modification of an existing component
-   to be called only from query_objects_changed_cb */
+/* Update non-time related variables for various structures on modification
+ * of an existing component to be called only from query_objects_changed_cb */
 static void
 update_cqa (CompQueuedAlarms *cqa, ECalComponent *newcomp)
 {
@@ -2221,9 +2259,13 @@ update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa)
 	GSList *instance_list;
 
 	debug (("..."));
-	for (instance_list = alarms->alarms; instance_list; instance_list = instance_list->next) {
+	for (instance_list = alarms->alarms;
+	     instance_list;
+	     instance_list = instance_list->next) {
 		al_inst = instance_list->data;
-		if (al_inst->trigger == qa->orig_trigger) {  /* FIXME if two or more alarm instances (audio, note)									  for same component have same trigger */
+		/* FIXME If two or more alarm instances (audio, note)
+		 *       for same component have same trigger... */
+		if (al_inst->trigger == qa->orig_trigger) {
 			g_free ((gchar *) qa->instance->auid);
 			qa->instance->auid = g_strdup (al_inst->auid);
 			break;
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index eea273cf62..2aab3cee71 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -402,8 +402,8 @@ config_data_init_debugging (void)
 }
 
 /* returns whether started debugging;
-   call config_data_stop_debugging() when started and you are done with it
-*/
+ * call config_data_stop_debugging() when started and you are done with it
+ */
 gboolean
 config_data_start_debugging (void)
 {
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
index e956f508a0..2a40950a00 100644
--- a/calendar/gui/alarm-notify/config-data.h
+++ b/calendar/gui/alarm-notify/config-data.h
@@ -51,7 +51,7 @@ void config_data_stop_debugging (void);
 #define debug(x) G_STMT_START {					\
 	if (config_data_start_debugging ()) {			\
 		g_print ("%s (%s): ", G_STRFUNC, G_STRLOC);	\
-		g_print  x ;					\
+		g_print  x;					\
 		g_print ("\n");					\
 								\
 		config_data_stop_debugging ();			\
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index a965c3d4da..ab80844b32 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -43,7 +43,6 @@ component_has_new_attendees (ECalComponent *comp)
 	return g_object_get_data (G_OBJECT (comp), "new-attendees") != NULL;
 }
 
-
 static gboolean
 component_has_recipients (ECalComponent *comp)
 {
diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h
index 68dca3e3aa..73514ec220 100644
--- a/calendar/gui/e-cal-config.h
+++ b/calendar/gui/e-cal-config.h
@@ -65,11 +65,14 @@ struct _ECalConfigTargetPrefs {
 
 typedef struct _EConfigItem ECalConfigItem;
 
-GType e_cal_config_get_type (void);
-ECalConfig *e_cal_config_new (gint type, const gchar *menuid);
-
-ECalConfigTargetSource *e_cal_config_target_new_source (ECalConfig *ecp, struct _ESource *source);
-ECalConfigTargetPrefs *e_cal_config_target_new_prefs (ECalConfig *ecp);
+GType		e_cal_config_get_type (void);
+ECalConfig *	e_cal_config_new		(gint type,
+						 const gchar *menuid);
+ECalConfigTargetSource *
+		e_cal_config_target_new_source	(ECalConfig *ecp,
+						 ESource *source);
+ECalConfigTargetPrefs *
+		e_cal_config_target_new_prefs	(ECalConfig *ecp);
 
 G_END_DECLS
 
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index 0b6afa34a6..bb089f1dd9 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -31,9 +31,11 @@
  *     one-column list store?  There's no mention of why this was done. */
 
 #define G_LIST(x)                        ((GList *) x)
-#define E_DATE_TIME_LIST_IS_SORTED(list) (E_DATE_TIME_LIST (list)->sort_column_id != -2)
-#define IS_VALID_ITER(dt_list, iter)     (iter!= NULL && iter->user_data != NULL && \
-                                          dt_list->stamp == iter->stamp)
+#define E_DATE_TIME_LIST_IS_SORTED(list) \
+	(E_DATE_TIME_LIST (list)->sort_column_id != -2)
+#define IS_VALID_ITER(dt_list, iter) \
+	(iter != NULL && iter->user_data != NULL && \
+	dt_list->stamp == iter->stamp)
 
 enum {
 	PROP_0,
@@ -74,7 +76,8 @@ copy_datetime (const ECalComponentDateTime *datetime)
 }
 
 static gint
-compare_datetime (const ECalComponentDateTime *datetime1, const ECalComponentDateTime *datetime2)
+compare_datetime (const ECalComponentDateTime *datetime1,
+                  const ECalComponentDateTime *datetime2)
 {
 	return icaltime_compare (*datetime1->value, *datetime2->value);
 }
@@ -494,7 +497,9 @@ e_date_time_list_set_date_time (EDateTimeList *date_time_list, GtkTreeIter *iter
 	datetime_old = G_LIST (iter->user_data)->data;
 	free_datetime (datetime_old);
 	G_LIST (iter->user_data)->data = copy_datetime (datetime);
-	row_updated (date_time_list, g_list_position (date_time_list->list, G_LIST (iter->user_data)));
+	row_updated (
+		date_time_list, g_list_position (
+		date_time_list->list, G_LIST (iter->user_data)));
 }
 
 gboolean
@@ -522,8 +527,11 @@ e_date_time_list_append (EDateTimeList *date_time_list, GtkTreeIter *iter,
 {
 	g_return_if_fail (datetime != NULL);
 
-	if (g_list_find_custom (date_time_list->list, datetime, (GCompareFunc)compare_datetime) == NULL) {
-		date_time_list->list = g_list_append (date_time_list->list, copy_datetime (datetime));
+	if (g_list_find_custom (
+			date_time_list->list, datetime,
+			(GCompareFunc)compare_datetime) == NULL) {
+		date_time_list->list = g_list_append (
+			date_time_list->list, copy_datetime (datetime));
 		row_added (date_time_list, g_list_length (date_time_list->list) - 1);
 	}
 
@@ -542,7 +550,8 @@ e_date_time_list_remove (EDateTimeList *date_time_list, GtkTreeIter *iter)
 
 	n = g_list_position (date_time_list->list, G_LIST (iter->user_data));
 	free_datetime ((ECalComponentDateTime *) G_LIST (iter->user_data)->data);
-	date_time_list->list = g_list_delete_link (date_time_list->list, G_LIST (iter->user_data));
+	date_time_list->list = g_list_delete_link (
+		date_time_list->list, G_LIST (iter->user_data));
 	row_deleted (date_time_list, n);
 }
 
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 2340f25220..cfe808f806 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -274,14 +274,14 @@ e_day_view_time_item_update (GnomeCanvasItem *item,
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
 static void
-edvti_draw_zone (GnomeCanvasItem   *canvas_item,
-		cairo_t 	   *cr,
-		gint		    x,
-		gint		    y,
-		gint		    width,
-		gint		    height,
-		gint		    x_offset,
-		icaltimezone       *use_zone)
+edvti_draw_zone (GnomeCanvasItem *canvas_item,
+                 cairo_t *cr,
+                 gint x,
+                 gint y,
+                 gint width,
+                 gint height,
+                 gint x_offset,
+                 icaltimezone *use_zone)
 {
 	EDayView *day_view;
 	EDayViewTimeItem *time_item;
@@ -604,11 +604,11 @@ edvti_draw_zone (GnomeCanvasItem   *canvas_item,
 
 static void
 e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
-			   cairo_t 	   *cr,
-			   gint		    x,
-			   gint		    y,
-			   gint		    width,
-			   gint		    height)
+                           cairo_t *cr,
+                           gint x,
+                           gint y,
+                           gint width,
+                           gint height)
 {
 	EDayViewTimeItem *time_item;
 
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index a548b764c0..f881fc99e7 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -4627,7 +4627,7 @@ e_day_view_check_layout (EDayView *day_view)
 	    || day_view->long_events_need_reshape)
 		e_day_view_reshape_long_events (day_view);
 
-	if (day_view->long_events_need_layout 
+	if (day_view->long_events_need_layout
 			&& day_view->rows_in_top_display != rows_in_top_display) {
 		day_view->rows_in_top_display = rows_in_top_display;
 		e_day_view_update_top_scroll (day_view, FALSE);
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index db1a8efa4b..ccf8fe255b 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -826,7 +826,8 @@ e_meeting_store_init (EMeetingStore *store)
 
 	store->priv->attendees = g_ptr_array_new ();
 	store->priv->refresh_queue = g_ptr_array_new ();
-	store->priv->refresh_data = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+	store->priv->refresh_data = g_hash_table_new_full (
+		g_str_hash, g_str_equal, g_free, NULL);
 
 	store->priv->mutex = g_mutex_new ();
 
@@ -1708,7 +1709,11 @@ async_read (GObject *source_object, GAsyncResult *res, gpointer data)
 }
 
 static void
-soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gboolean retrying, gpointer data)
+soup_authenticate (SoupSession *session,
+                   SoupMessage *msg,
+                   SoupAuth *auth,
+                   gboolean retrying,
+                   gpointer data)
 {
 	SoupURI *suri;
 	const gchar *orig_uri;
@@ -1757,7 +1762,10 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool
 
 		description = g_string_new ("");
 
-		g_string_append_printf (description, _("Enter password to access free/busy information on server %s as user %s"), bold_host, bold_user);
+		g_string_append_printf (
+			description, _("Enter password to access "
+			"free/busy information on server %s as user %s"),
+			bold_host, bold_user);
 
 		g_free (bold_host);
 		g_free (bold_user);
@@ -1767,9 +1775,12 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool
 			g_string_append_printf (description, _("Failure reason: %s"), msg->reason_phrase);
 		}
 
-		password = e_passwords_ask_password (_("Enter password"), "Calendar", orig_uri, description->str,
-					     E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET | E_PASSWORDS_ONLINE | (retrying ? E_PASSWORDS_REPROMPT : 0),
-					     &remember, NULL);
+		password = e_passwords_ask_password (
+			_("Enter password"), "Calendar", orig_uri,
+			description->str, E_PASSWORDS_REMEMBER_FOREVER |
+			E_PASSWORDS_SECRET | E_PASSWORDS_ONLINE |
+			(retrying ? E_PASSWORDS_REPROMPT : 0),
+			&remember, NULL);
 
 		g_string_free (description, TRUE);
 
@@ -1822,12 +1833,17 @@ soup_msg_ready_cb (SoupSession *session, SoupMessage *msg, gpointer user_data)
 	g_return_if_fail (qdata != NULL);
 
 	if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
-		qdata->string = g_string_new_len (msg->response_body->data, msg->response_body->length);
+		qdata->string = g_string_new_len (
+			msg->response_body->data,
+			msg->response_body->length);
 		process_free_busy (qdata, qdata->string->str);
 	} else {
-		g_warning ("Unable to access free/busy url: %s",
-				msg->reason_phrase && *msg->reason_phrase ? msg->reason_phrase :
-				(soup_status_get_phrase (msg->status_code) ? soup_status_get_phrase (msg->status_code) : "Unknown error"));
+		g_warning (
+			"Unable to access free/busy url: %s",
+			msg->reason_phrase && *msg->reason_phrase ?
+			msg->reason_phrase : (soup_status_get_phrase (
+			msg->status_code) ? soup_status_get_phrase (
+			msg->status_code) : "Unknown error"));
 		process_callbacks (qdata);
 	}
 }
@@ -1867,7 +1883,9 @@ download_with_libsoup (const gchar *uri, EMeetingStoreQueueData *qdata)
 	g_object_unref (proxy);
 
 	soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT);
-	soup_message_add_header_handler (msg, "got_body", "Location", G_CALLBACK (redirect_handler), session);
+	soup_message_add_header_handler (
+		msg, "got_body", "Location",
+		G_CALLBACK (redirect_handler), session);
 	soup_message_headers_append (msg->request_headers, "Connection", "close");
 	soup_session_queue_message (session, msg, soup_msg_ready_cb, qdata);
 }
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 05b5f0a24a..7b50de9cf1 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -87,7 +87,9 @@ itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_
 	const gchar *strip;
 	gboolean user_org = FALSE;
 
-	if (!e_cal_component_has_organizer (comp) || (!skip_cap_test && e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_ORGANIZER)))
+	if (!e_cal_component_has_organizer (comp) ||
+		(!skip_cap_test && e_cal_get_static_capability (
+		client, CAL_STATIC_CAPABILITY_NO_ORGANIZER)))
 		return FALSE;
 
 	e_cal_component_get_organizer (comp, &organizer);
@@ -95,10 +97,12 @@ itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_
 
 		strip = itip_strip_mailto (organizer.value);
 
-		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) {
+		if (e_cal_get_static_capability (
+			client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) {
 			gchar *email = NULL;
 
-			if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
+			if (e_cal_get_cal_address (client, &email, NULL) &&
+				!g_ascii_strcasecmp (email, strip)) {
 				g_free (email);
 
 				return TRUE;
@@ -108,7 +112,9 @@ itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_
 			return FALSE;
 		}
 
-		user_org = e_account_list_find (itip_addresses_get (), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
+		user_org = e_account_list_find (
+			itip_addresses_get (),
+			E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
 	}
 
 	return user_org;
@@ -127,13 +133,17 @@ itip_sentby_is_user (ECalComponent *comp, ECal *client)
 	const gchar *strip;
 	gboolean user_sentby = FALSE;
 
-	if (!e_cal_component_has_organizer (comp) ||e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_ORGANIZER))
+	if (!e_cal_component_has_organizer (comp) ||
+		e_cal_get_static_capability (
+		client, CAL_STATIC_CAPABILITY_NO_ORGANIZER))
 		return FALSE;
 
 	e_cal_component_get_organizer (comp, &organizer);
 	if (organizer.sentby != NULL) {
 		strip = itip_strip_mailto (organizer.sentby);
-		user_sentby = e_account_list_find (itip_addresses_get (), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
+		user_sentby = e_account_list_find (
+			itip_addresses_get (),
+			E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
 	}
 
 	return user_sentby;
@@ -166,7 +176,8 @@ get_attendee_if_attendee_sentby_is_user (GSList *attendees, gchar *address)
 	for (l = attendees; l; l = l->next) {
 		ECalComponentAttendee *attendee = l->data;
 
-		if (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address)) {
+		if (attendee->sentby && g_str_equal (
+			itip_strip_mailto (attendee->sentby), address)) {
 			return attendee;
 		}
 	}
@@ -327,12 +338,16 @@ foreach_tzid_callback (icalparameter *param, gpointer data)
 	if (!vtimezone_comp)
 		return;
 
-	icalcomponent_add_component (tz_data->icomp, icalcomponent_new_clone (vtimezone_comp));
+	icalcomponent_add_component (
+		tz_data->icomp, icalcomponent_new_clone (vtimezone_comp));
 	g_hash_table_insert (tz_data->tzids, (gchar *)tzid, (gchar *)tzid);
 }
 
 static icalcomponent *
-comp_toplevel_with_zones (ECalComponentItipMethod method, ECalComponent *comp, ECal *client, icalcomponent *zones)
+comp_toplevel_with_zones (ECalComponentItipMethod method,
+                          ECalComponent *comp,
+                          ECal *client,
+                          icalcomponent *zones)
 {
 	icalcomponent *top_level, *icomp;
 	icalproperty *prop;
@@ -426,7 +441,11 @@ comp_from (ECalComponentItipMethod method, ECalComponent *comp)
 }
 
 static EDestination **
-comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users, gboolean reply_all, const GSList *only_attendees)
+comp_to_list (ECalComponentItipMethod method,
+              ECalComponent *comp,
+              GList *users,
+              gboolean reply_all,
+              const GSList *only_attendees)
 {
 	ECalComponentOrganizer organizer;
 	GSList *attendees, *l;
@@ -481,7 +500,9 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 			else if (att->status == ICAL_PARTSTAT_DELEGATED && (att->delto && *att->delto)
 					&& !(att->rsvp) && method == E_CAL_COMPONENT_METHOD_REQUEST)
 				continue;
-			else if (only_attendees && !comp_editor_have_in_new_attendees_lst (only_attendees, itip_strip_mailto (att->value)))
+			else if (only_attendees &&
+				!comp_editor_have_in_new_attendees_lst (
+				only_attendees, itip_strip_mailto (att->value)))
 				continue;
 
 			destination = e_destination_new ();
@@ -514,7 +535,9 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 
 				if (att->cutype != ICAL_CUTYPE_INDIVIDUAL && att->cutype != ICAL_CUTYPE_GROUP)
 					continue;
-				else if (only_attendees && !comp_editor_have_in_new_attendees_lst (only_attendees, itip_strip_mailto (att->value)))
+				else if (only_attendees &&
+					!comp_editor_have_in_new_attendees_lst (
+					only_attendees, itip_strip_mailto (att->value)))
 					continue;
 
 				destination = e_destination_new ();
@@ -570,7 +593,10 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 			if (att->cutype != ICAL_CUTYPE_INDIVIDUAL && att->cutype != ICAL_CUTYPE_GROUP)
 				continue;
 
-			if (!g_ascii_strcasecmp (itip_strip_mailto (att->value), sender) || (att->sentby && !g_ascii_strcasecmp (itip_strip_mailto (att->sentby), sender))) {
+			if (!g_ascii_strcasecmp (
+				itip_strip_mailto (att->value), sender) ||
+				(att->sentby && !g_ascii_strcasecmp (
+				itip_strip_mailto (att->sentby), sender))) {
 
 				if (!(att->delfrom && *att->delfrom))
 					break;
@@ -660,7 +686,10 @@ comp_subject (ECalComponentItipMethod method, ECalComponent *comp)
 
 			for (l = alist; l != NULL; l = l->next) {
 				a = l->data;
-				if ((sender && *sender) && (g_ascii_strcasecmp (itip_strip_mailto (a->value), sender) || (a->sentby && g_ascii_strcasecmp (itip_strip_mailto (a->sentby), sender))))
+				if ((sender && *sender) && (g_ascii_strcasecmp (
+					itip_strip_mailto (a->value), sender) ||
+					(a->sentby && g_ascii_strcasecmp (
+					itip_strip_mailto (a->sentby), sender))))
 					break;
 			}
 			g_free (sender);
@@ -816,8 +845,11 @@ comp_description (ECalComponent *comp,
 }
 
 static gboolean
-comp_server_send (ECalComponentItipMethod method, ECalComponent *comp, ECal *client,
-		  icalcomponent *zones, GList **users)
+comp_server_send (ECalComponentItipMethod method,
+                  ECalComponent *comp,
+                  ECal *client,
+                  icalcomponent *zones,
+                  GList **users)
 {
 	icalcomponent *top_level, *returned_icalcomp = NULL;
 	gboolean retval = TRUE;
@@ -828,9 +860,14 @@ comp_server_send (ECalComponentItipMethod method, ECalComponent *comp, ECal *cli
 		/* FIXME Really need a book problem status code */
 		if (error->code != E_CALENDAR_STATUS_OK) {
 			if (error->code == E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS) {
-				e_notice (NULL, GTK_MESSAGE_ERROR, _("Unable to book a resource, the new event collides with some other."));
+				e_notice (
+					NULL, GTK_MESSAGE_ERROR,
+					_("Unable to book a resource, the "
+					  "new event collides with some other."));
 			} else {
-				gchar *msg = g_strconcat (_("Unable to book a resource, error: "), error->message, NULL);
+				gchar *msg = g_strconcat (
+					_("Unable to book a resource, error: "),
+					error->message, NULL);
 				e_notice (NULL, GTK_MESSAGE_ERROR, msg);
 				g_free (msg);
 			}
@@ -881,7 +918,10 @@ comp_limit_attendees (ECalComponent *comp)
 		attendee_text = g_strdup (itip_strip_mailto (attendee));
 		g_free (attendee);
 		attendee_text = g_strstrip (attendee_text);
-		found = match = e_account_list_find (itip_addresses_get (), E_ACCOUNT_FIND_ID_ADDRESS, attendee_text) != NULL;
+		found = match = e_account_list_find (
+			itip_addresses_get (),
+			E_ACCOUNT_FIND_ID_ADDRESS,
+			attendee_text) != NULL;
 
 		if (!found) {
 			param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER);
@@ -889,7 +929,10 @@ comp_limit_attendees (ECalComponent *comp)
 				attendee_sentby = icalparameter_get_sentby (param);
 				attendee_sentby_text = g_strdup (itip_strip_mailto (attendee_sentby));
 				attendee_sentby_text = g_strstrip (attendee_sentby_text);
-				found = match = e_account_list_find (itip_addresses_get (), E_ACCOUNT_FIND_ID_ADDRESS, attendee_sentby_text) != NULL;
+				found = match = e_account_list_find (
+					itip_addresses_get (),
+					E_ACCOUNT_FIND_ID_ADDRESS,
+					attendee_sentby_text) != NULL;
 			}
 		}
 
@@ -938,7 +981,10 @@ comp_sentby (ECalComponent *comp, ECal *client)
 	for (l = attendees; l; l = l->next) {
 		ECalComponentAttendee *a = l->data;
 
-		if (!g_ascii_strcasecmp (itip_strip_mailto (a->value), user) || (a->sentby && !g_ascii_strcasecmp (itip_strip_mailto (a->sentby), user))) {
+		if (!g_ascii_strcasecmp (
+			itip_strip_mailto (a->value), user) ||
+			(a->sentby && !g_ascii_strcasecmp (
+			itip_strip_mailto (a->sentby), user))) {
 			g_free (user);
 			return;
 		}
@@ -1273,7 +1319,10 @@ find_enabled_account (EAccountList *accounts, const gchar *id_address)
 }
 
 static void
-setup_from (ECalComponentItipMethod method, ECalComponent *comp, ECal *client, EComposerHeaderTable *table)
+setup_from (ECalComponentItipMethod method,
+            ECalComponent *comp,
+            ECal *client,
+            EComposerHeaderTable *table)
 {
 	EAccountList *accounts;
 
@@ -1350,7 +1399,9 @@ itip_send_comp (ECalComponentItipMethod method,
 	}
 
 	/* check whether backend could handle sending requests/updates */
-	if (method != E_CAL_COMPONENT_METHOD_PUBLISH && e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) {
+	if (method != E_CAL_COMPONENT_METHOD_PUBLISH &&
+		e_cal_get_static_capability (client,
+		CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) {
 		if (users) {
 			g_list_foreach (users, (GFunc) g_free, NULL);
 			g_list_free (users);
@@ -1366,7 +1417,10 @@ itip_send_comp (ECalComponentItipMethod method,
 		goto cleanup;
 
 	/* Recipients */
-	destinations = comp_to_list (method, comp, users, FALSE, only_new_attendees ? g_object_get_data (G_OBJECT (send_comp), "new-attendees") : NULL);
+	destinations = comp_to_list (
+		method, comp, users, FALSE,
+		only_new_attendees ?  g_object_get_data (
+		G_OBJECT (send_comp), "new-attendees") : NULL);
 	if (method != E_CAL_COMPONENT_METHOD_PUBLISH) {
 		if (destinations == NULL) {
 			/* We sent them all via the server */
@@ -1550,7 +1604,10 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 			start_zone = icaltimezone_get_builtin_timezone_from_tzid (dtstart.tzid);
 			if (!start_zone) {
 				if (!e_cal_get_timezone (client, dtstart.tzid, &start_zone, NULL))
-					g_warning ("Couldn't get timezone from server: %s", dtstart.tzid ? dtstart.tzid : "");
+					g_warning (
+						"Couldn't get timezone from "
+						"server: %s", dtstart.tzid ?
+						dtstart.tzid : "");
 			}
 
 			if (!start_zone || dtstart.value->is_date)
@@ -1560,7 +1617,10 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 			time = g_strdup (ctime (&start));
 		}
 
-		body = g_string_new ("<br><br><hr><br><b>______ Original Appointment ______ </b><br><br><table>");
+		body = g_string_new (
+			"<br><br><hr><br><b>"
+			"______ Original Appointment ______ "
+			"</b><br><br><table>");
 
 		if (orig_from && *orig_from)
 			g_string_append_printf (body,
@@ -1841,7 +1901,8 @@ check_time (const struct icaltimetype tmval, gboolean can_null_time)
 		tmval.second >= 0 && tmval.second < 60;
 }
 
-/* returns whether the passed-in icalcomponent is valid or not. It does some sanity checks on values too. */
+/* Returns whether the passed-in icalcomponent is valid or not.
+ * It does some sanity checks on values too. */
 gboolean
 is_icalcomp_valid (icalcomponent *icalcomp)
 {
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 5c62d3c111..804330cac0 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -528,7 +528,14 @@ titled_box (GtkPrintContext *context, const gchar *text,
 static gboolean
 get_show_week_numbers (void)
 {
-	return e_shell_settings_get_boolean (e_shell_get_shell_settings (e_shell_get_default ()), "cal-show-week-numbers");
+	EShell *shell;
+	EShellSettings *shell_settings;
+
+	shell = e_shell_get_default ();
+	shell_settings = e_shell_get_shell_settings (shell);
+
+	return e_shell_settings_get_boolean (
+		shell_settings, "cal-show-week-numbers");
 }
 
 enum datefmt {
@@ -614,14 +621,17 @@ calc_small_month_width (GtkPrintContext *context, gdouble for_height)
 	gint ii;
 
 	font_bold = get_font_for_size (for_height / 7.4, PANGO_WEIGHT_BOLD);
-	res = MAX (evo_calendar_print_renderer_get_width (context, font_bold, "23"), res);
+	res = MAX (evo_calendar_print_renderer_get_width (
+		context, font_bold, "23"), res);
 	for (ii = 0; ii < 7; ii++) {
-		res = MAX (evo_calendar_print_renderer_get_width (context, font_bold, _(daynames[ii])), res);
+		res = MAX (evo_calendar_print_renderer_get_width (
+			context, font_bold, _(daynames[ii])), res);
 	}
 
 	pango_font_description_free (font_bold);
 
-	/* res is max cell width, thus multiply it with column count plus some space between columns */
+	/* res is max cell width, so multiply it with column
+	 * count plus some space between columns. */
 	res = (res + 1.0) * (7 + (get_show_week_numbers () ? 1 : 0)) - 1.0;
 
 	if (res < MIN_SMALL_MONTH_WIDTH)
@@ -706,7 +716,8 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
 		print_text (
 			context, font_bold,
 			_(daynames[weekday]), PANGO_ALIGN_RIGHT,
-			x1 + (x + (week_numbers ? 1 : 0)) * col_width, x1 + (x + 1 + (week_numbers ? 1 : 0)) * col_width,
+			x1 + (x + (week_numbers ? 1 : 0)) * col_width,
+			x1 + (x + 1 + (week_numbers ? 1 : 0)) * col_width,
 			y1, y1 + row_height * 1.4);
 		weekday = (weekday + 1) % 7;
 	}
@@ -741,7 +752,11 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
 				convert_timet_to_struct_tm (week_begin, zone, &tm);
 
 				/* month in e_calendar_item_get_week_number is also zero-based */
-				sprintf (buf, "%d", e_calendar_item_get_week_number (NULL, tm.tm_mday, tm.tm_mon, tm.tm_year + 1900));
+				sprintf (
+					buf, "%d",
+					e_calendar_item_get_week_number (
+					NULL, tm.tm_mday, tm.tm_mon,
+					tm.tm_year + 1900));
 
 				print_text (context, font_normal, buf, PANGO_ALIGN_RIGHT,
 					    cell_left, text_right,
@@ -901,9 +916,13 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal,
 	max_font_size = width * 0.2;
 	minute_font_size = MIN (font_size, max_font_size);
 	font_minute = get_font_for_size (minute_font_size, PANGO_WEIGHT_BOLD);
-	hour_minute_width = evo_calendar_print_renderer_get_width (context, font_minute, use_24_hour ? "00" : _("am"));
+	hour_minute_width = evo_calendar_print_renderer_get_width (
+		context, font_minute, use_24_hour ? "00" : _("am"));
 	if (!use_24_hour)
-		hour_minute_width = MAX (hour_minute_width, evo_calendar_print_renderer_get_width (context, font_minute, _("pm")));
+		hour_minute_width =
+			MAX (hour_minute_width,
+			evo_calendar_print_renderer_get_width (
+			context, font_minute, _("pm")));
 
 	row = 0;
 	hour_minute_x = left + width - hour_minute_width - 3;
@@ -2245,7 +2264,9 @@ print_day_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 			      0.0, HEADER_HEIGHT + 4, 1.0, 0.9);
 
 		/* Print the 2 mini calendar-months. */
-		l = width - SMALL_MONTH_PAD - (small_month_width + week_numbers_inc) * 2  - SMALL_MONTH_SPACING;
+		l = width - SMALL_MONTH_PAD -
+			(small_month_width + week_numbers_inc) * 2 -
+			SMALL_MONTH_SPACING;
 
 		print_month_small (context, gcal, date,
 				   l, 2, l + small_month_width + week_numbers_inc, HEADER_HEIGHT + 2,
@@ -2338,9 +2359,13 @@ print_work_week_background (GtkPrintContext *context, GnomeCalendar *gcal,
 	max_font_size = width * 0.2;
 	minute_font_size = MIN (font_size, max_font_size);
 	font_minute = get_font_for_size (minute_font_size, PANGO_WEIGHT_BOLD);
-	hour_minute_xr = evo_calendar_print_renderer_get_width (context, font_minute, use_24_hour ? "00" : _("am"));
+	hour_minute_xr = evo_calendar_print_renderer_get_width (
+		context, font_minute, use_24_hour ? "00" : _("am"));
 	if (!use_24_hour)
-		hour_minute_xr = MAX (hour_minute_xr, evo_calendar_print_renderer_get_width (context, font_minute, _("pm")));
+		hour_minute_xr =
+			MAX (hour_minute_xr,
+			evo_calendar_print_renderer_get_width (
+			context, font_minute, _("pm")));
 
 	row = 0;
 	hour_minute_xl = left + width - hour_minute_xr - 3;
@@ -2624,7 +2649,9 @@ print_work_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date
 	GtkPageSetup *setup;
 	icaltimezone *zone;
 	time_t when, start, end;
-	gdouble width, height, l, small_month_width = calc_small_month_width (context, HEADER_HEIGHT);
+	gdouble width, height, l;
+	gdouble small_month_width;
+	gdouble weeknum_inc;
 	gint i, days = 5;
 	gchar buf[100];
 	const gint LONG_EVENT_OFFSET = 6;
@@ -2632,7 +2659,6 @@ print_work_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date
 	struct tm tm;
 	gdouble day_width, day_x;
 	ECalModel *model;
-	gdouble weeknum_inc = get_show_week_numbers () ? small_month_width / 7.0 : 0;
 
 	model = gnome_calendar_get_model (gcal);
 	zone = e_cal_model_get_timezone (model);
@@ -2642,6 +2668,9 @@ print_work_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date
 	width = gtk_page_setup_get_page_width (setup, GTK_UNIT_POINTS);
 	height = gtk_page_setup_get_page_height (setup, GTK_UNIT_POINTS);
 
+	small_month_width = calc_small_month_width (context, HEADER_HEIGHT);
+	weeknum_inc = get_show_week_numbers () ? small_month_width / 7.0 : 0;
+
 	/* We always start on a Monday */
 	start = time_week_begin_with_zone (date, 1, zone);
 	end = time_add_day_with_zone (start, days, zone);
@@ -2661,7 +2690,8 @@ print_work_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date
 	print_border (context, 0.0, width, 0.0, HEADER_HEIGHT, 1.0, 0.9);
 
 	/* Print the 2 mini calendar-months. */
-	l = width - SMALL_MONTH_PAD - (small_month_width + weeknum_inc) * 2  - SMALL_MONTH_SPACING;
+	l = width - SMALL_MONTH_PAD - (small_month_width + weeknum_inc) * 2 -
+		SMALL_MONTH_SPACING;
 
 	print_month_small (context, gcal, start,
 			   l, 4, l + small_month_width + weeknum_inc, HEADER_HEIGHT + 4,
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 44993724a9..650c2fa1e8 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -220,8 +220,8 @@ weekday_picker_realize (GtkWidget *widget)
 
 static void
 weekday_picker_get_preferred_width (GtkWidget *widget,
-                             	    gint *minimum_width,
-				    gint *natural_width)
+                                    gint *minimum_width,
+                                    gint *natural_width)
 {
 	WeekdayPicker *wp;
 	WeekdayPickerPrivate *priv;
@@ -231,10 +231,11 @@ weekday_picker_get_preferred_width (GtkWidget *widget,
 
 	*minimum_width = *natural_width = (priv->max_letter_width + 2 * PADDING + 1) * 7 + 1;
 }
+
 static void
 weekday_picker_get_preferred_height (GtkWidget *widget,
-                             	    gint *minimum_height,
-				    gint *natural_height)
+                                     gint *minimum_height,
+                                     gint *natural_height)
 {
 	WeekdayPicker *wp;
 	WeekdayPickerPrivate *priv;
@@ -242,7 +243,8 @@ weekday_picker_get_preferred_height (GtkWidget *widget,
 	wp = WEEKDAY_PICKER (widget);
 	priv = wp->priv;
 
-	*minimum_height = *natural_height = (priv->font_ascent + priv->font_descent + 2 * PADDING + 2);
+	*minimum_height = *natural_height =
+		(priv->font_ascent + priv->font_descent + 2 * PADDING + 2);
 }
 
 static void