5 files changed, 7 insertions, 8 deletions
diff --git a/calendar/gui/dialogs/alarm-options.c b/calendar/gui/dialogs/alarm-options.c
index 335bb0dec1..8d53affacb 100644
--- a/calendar/gui/dialogs/alarm-options.c
+++ b/calendar/gui/dialogs/alarm-options.c
@@ -592,7 +592,7 @@ alarm_options_dialog_run (CalComponentAlarm *alarm)
 
 	g_return_val_if_fail (alarm != NULL, FALSE);
 
-	dialog.xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-options.glade", NULL);
+	dialog.xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-options.glade", NULL, NULL);
 	if (!dialog.xml) {
 		g_message ("alarm_options_dialog_new(): Could not load the Glade XML file!");
 		return FALSE;
diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c
index 48494e7f54..f16c7198b9 100644
--- a/calendar/gui/dialogs/alarm-page.c
+++ b/calendar/gui/dialogs/alarm-page.c
@@ -27,7 +27,6 @@
 
 #include <string.h>
 #include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 #include <gal/widgets/e-unicode.h>
@@ -861,7 +860,7 @@ alarm_page_construct (AlarmPage *apage)
 	priv = apage->priv;
 
 	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-page.glade",
-				   NULL);
+				   NULL, NULL);
 	if (!priv->xml) {
 		g_message ("alarm_page_construct(): "
 			   "Could not load the Glade XML file!");
diff --git a/calendar/gui/dialogs/alarm-page.h b/calendar/gui/dialogs/alarm-page.h
index aa1a6be26b..e0d862ad41 100644
--- a/calendar/gui/dialogs/alarm-page.h
+++ b/calendar/gui/dialogs/alarm-page.h
@@ -26,7 +26,7 @@
 
 #include "comp-editor-page.h"
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 
 
@@ -56,6 +56,6 @@ AlarmPage *alarm_page_new       (void);
 
 
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif
diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h
index 51a94a6918..305a97b513 100644
--- a/calendar/gui/dialogs/comp-editor-page.h
+++ b/calendar/gui/dialogs/comp-editor-page.h
@@ -22,12 +22,11 @@
 #define COMP_EDITOR_PAGE_H
 
 #include <time.h>
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtkwidget.h>
 #include <cal-util/cal-component.h>
 #include "cal-client.h"
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 
 
@@ -107,6 +106,6 @@ void       comp_editor_page_display_validation_error (CompEditorPage      *page,
 
 
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
index 948b34221c..91652c59d9 100644
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ b/calendar/gui/dialogs/comp-editor-util.h
@@ -23,6 +23,7 @@
 
 #include <gtk/gtkwidget.h>
 #include <bonobo/bonobo-control.h>
+#include <bonobo/bonobo-event-source.h>
 #include "Evolution-Addressbook-SelectNames.h"
 #include "comp-editor-page.h"