diff options
| -rw-r--r-- | calendar/ChangeLog | 11 | ||||
| -rw-r--r-- | calendar/gui/calendar-model.h | 5 | ||||
| -rw-r--r-- | calendar/gui/dialogs/alarm-options.c | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/alarm-page.c | 3 | ||||
| -rw-r--r-- | calendar/gui/dialogs/alarm-page.h | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor-page.h | 5 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor-util.h | 1 |
7 files changed, 20 insertions, 11 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 953642f7db..e394f77361 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,16 @@ 2002-11-05 Rodrigo Moya <rodrigo@ximian.com> + * gui/dialogs/alarm-options.c (alarm_options_dialog_run): adapted to + to new glade_xml_new signature. + + * gui/calendar-model.h: + * gui/dialogs/comp-editor-page.h: + * gui/dialogs/alarm-page.[ch]: removed non-existant header files. + + * gui/dialogs/comp-editor-util.h: added missing headers. + +2002-11-05 Rodrigo Moya <rodrigo@ximian.com> + * pcs/cal-backend.c: use libxml2 headers. * gui/alarm-notify/Makefile.am: diff --git a/calendar/gui/calendar-model.h b/calendar/gui/calendar-model.h index 6ac175034c..15936367ef 100644 --- a/calendar/gui/calendar-model.h +++ b/calendar/gui/calendar-model.h @@ -22,11 +22,10 @@ #ifndef CALENDAR_MODEL_H #define CALENDAR_MODEL_H -#include <libgnome/gnome-defs.h> #include <gal/e-table/e-table-model.h> #include <cal-client/cal-client.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -95,6 +94,6 @@ void calendar_model_set_status_message (CalendarModel *model, -END_GNOME_DECLS +G_END_DECLS #endif 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" |