aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/GNOME_Evolution_Calendar.server.in (renamed from calendar/gui/GNOME_Evolution_Calendar.oaf.in)0
-rw-r--r--calendar/gui/Makefile.am12
-rw-r--r--calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in (renamed from calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in)0
-rw-r--r--calendar/gui/alarm-notify/Makefile.am14
5 files changed, 21 insertions, 13 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d178328584..2bd29bc8a3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,13 @@
2002-11-06 Rodrigo Moya <rodrigo@ximian.com>
+ * gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
+ * gui/GNOME_Evolution_Calendar.server.in: renmaed .oaf.in files.
+
+ * gui/alarm-notify/Makefile.am:
+ * gui/Makefile.am: fixed rules for .server files.
+
+2002-11-06 Rodrigo Moya <rodrigo@ximian.com>
+
* gui/dialogs/comp-editor-util.[ch]
(comp_editor_connect_contacts_changed): don't return a
Bonobo_EventSource_ListenerId, since it does not exist anymore,
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.server.in
index 68fd2a07d0..68fd2a07d0 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.server.in
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 6e6f640b81..1ae5c01c2e 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -181,18 +181,18 @@ evolution_calendar_LDADD = \
evolution_calendar_LDFLAGS = -export-dynamic
-oafdir = $(datadir)/oaf
-oaf_in_files = \
- GNOME_Evolution_Calendar.oaf.in
+serversdir = $(datadir)/bonobo/servers
+servers_in_files = \
+ GNOME_Evolution_Calendar.server.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+servers_DATA = $(servers_in_files:.server.in=.server)
-@INTLTOOL_OAF_RULE@
+@INTLTOOL_SERVER_RULE@
EXTRA_DIST = \
$(glade_DATA) \
$(etspec_DATA) \
- $(oaf_in_files)
+ $(servers_in_files)
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(help_base)/C
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in
index 86f5c71493..86f5c71493 100644
--- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in
+++ b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index ca28d1c10b..4a4dc86d25 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -66,17 +66,17 @@ evolution_alarm_notify_LDADD = \
evolution_alarm_notify_LDFLAGS = -export-dynamic
-oafdir = $(datadir)/oaf
-oaf_in_files = \
- GNOME_Evolution_Calendar_AlarmNotify.oaf.in
+serversdir = $(libdir)/bonobo/servers
+servers_in_files = \
+ GNOME_Evolution_Calendar_AlarmNotify.server.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+servers_DATA = $(servers_in_files:.server.in=.server)
-@INTLTOOL_OAF_RULE@
+@INTLTOOL_SERVER_RULE@
EXTRA_DIST = \
- $(oaf_DATA) \
- $(oaf_in_files) \
+ $(servers_DATA) \
+ $(servers_in_files) \
$(glade_DATA)
BUILT_SOURCES = $(CORBA_GENERATED)