diff --git a/ChangeLog b/ChangeLog
index 280084cf8..ab7db389b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-28  Mathias Hasselmann  <mathias@openismus.com>
+
+	Apply trivial code-style changes from attachement 101101. (#339540)
+
+	* tests/testcalendar.c: Some updates to current GTK+ code-style.
+
 2007-12-28  Mathias Hasselmann  <mathias@openismus.com>
 
 	Restructure testcalendar for testing calendar details. (#339540)
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 7ac0f8c0c..0c751fbdd 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -58,7 +58,8 @@ enum
  * GtkCalendar
  */
 
-void calendar_date_to_string (CalendarData *data,
+static void
+calendar_date_to_string (CalendarData *data,
 			      char         *buffer,
 			      gint          buff_len)
 {
@@ -128,7 +129,8 @@ calendar_set_signal_strings (char         *sig_str,
   gtk_label_set_text (GTK_LABEL (data->last_sig), sig_str);
 }
 
-void calendar_month_changed (GtkWidget    *widget,
+static void
+calendar_month_changed (GtkWidget    *widget,
                              CalendarData *data)
 {
   char buffer[256] = "month_changed: ";
@@ -137,7 +139,8 @@ void calendar_month_changed (GtkWidget    *widget,
   calendar_set_signal_strings (buffer, data);
 }
 
-void calendar_day_selected (GtkWidget    *widget,
+static void
+calendar_day_selected (GtkWidget    *widget,
                             CalendarData *data)
 {
   char buffer[256] = "day_selected: ";
@@ -148,7 +151,8 @@ void calendar_day_selected (GtkWidget    *widget,
   calendar_update_details (data);
 }
 
-void calendar_day_selected_double_click (GtkWidget    *widget,
+static void
+calendar_day_selected_double_click (GtkWidget    *widget,
                                          CalendarData *data)
 {
   char buffer[256] = "day_selected_double_click: ";
@@ -167,7 +171,8 @@ void calendar_day_selected_double_click (GtkWidget    *widget,
   }
 }
 
-void calendar_prev_month (GtkWidget    *widget,
+static void
+calendar_prev_month (GtkWidget    *widget,
                           CalendarData *data)
 {
   char buffer[256] = "prev_month: ";
@@ -176,8 +181,9 @@ void calendar_prev_month (GtkWidget    *widget,
   calendar_set_signal_strings (buffer, data);
 }
 
-void calendar_next_month( GtkWidget    *widget,
-                            CalendarData *data )
+static void
+calendar_next_month (GtkWidget    *widget,
+                     CalendarData *data)
 {
   char buffer[256] = "next_month: ";
 
@@ -185,8 +191,9 @@ void calendar_next_month( GtkWidget    *widget,
   calendar_set_signal_strings (buffer, data);
 }
 
-void calendar_prev_year( GtkWidget    *widget,
-                            CalendarData *data )
+static void
+calendar_prev_year (GtkWidget    *widget,
+                    CalendarData *data)
 {
   char buffer[256] = "prev_year: ";
 
@@ -194,8 +201,9 @@ void calendar_prev_year( GtkWidget    *widget,
   calendar_set_signal_strings (buffer, data);
 }
 
-void calendar_next_year( GtkWidget    *widget,
-                            CalendarData *data )
+static void
+calendar_next_year (GtkWidget    *widget,
+                    CalendarData *data)
 {
   char buffer[256] = "next_year: ";
 
@@ -231,9 +239,8 @@ calendar_toggle_flag (GtkWidget    *toggle,
   
 }
 
-void
-calendar_select_font (GtkWidget    *button,
-                      CalendarData *calendar)
+void calendar_select_font (GtkWidget    *button,
+                                 CalendarData *calendar)
 {
   const char *font = NULL;
   GtkRcStyle *style;