diff --git a/ChangeLog b/ChangeLog
index fede3f24a3..0ef47e7a5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-04  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkseparatortoolitem.c
+	* tests/testactions.c: remove pointless #undef GTK_DISABLE_DEPRECATED.
+
+	* gtk/gtkcalendar.c (calendar_set_display_option): use
+	gtk_calendar_set_display_options() instead of the deprecated
+	gtk_calendar_display_options().
+
 2008-08-04  Carlos Garnacho  <carlos@imendio.com>
 
 	* gtk/gtkfilechooserbutton.c: Fix "/* within comment" warning.
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index a1c73bb22e..ea1005c3a1 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -47,9 +47,7 @@
 #include <windows.h>
 #endif
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkcalendar.h"
-
 #include "gtkdnd.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
@@ -1269,7 +1267,7 @@ calendar_set_display_option (GtkCalendar              *calendar,
     flags = calendar->display_flags | flag;
   else
     flags = calendar->display_flags & ~flag; 
-  gtk_calendar_display_options (calendar, flags);
+  gtk_calendar_set_display_options (calendar, flags);
 }
 
 static gboolean
diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c
index 683106b2d9..52af0df8b2 100644
--- a/gtk/gtkseparatortoolitem.c
+++ b/gtk/gtkseparatortoolitem.c
@@ -19,8 +19,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "config.h"
 #include "gtkseparatormenuitem.h"
 #include "gtkseparatortoolitem.h"
diff --git a/tests/testactions.c b/tests/testactions.c
index 3d55d8a6a4..f63aac84c6 100644
--- a/tests/testactions.c
+++ b/tests/testactions.c
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef GTK_DISABLE_DEPRECATED
 #include "config.h"
 #include <gtk/gtk.h>