diff options
| author | Rodrigo Moya <rodrigo@ximian.com> | 2002-11-08 05:50:17 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2002-11-08 05:50:17 +0800 |
| commit | 2bc072651cc5650a4a799746ba187cee8e4b6903 (patch) | |
| tree | 6d0767a225a6b39884cca267b22f9dfd33f3b145 | |
| parent | 3c508b93d767f418a00e4404ca97d46b38e50e37 (diff) | |
| download | gsoc2013-evolution-2bc072651cc5650a4a799746ba187cee8e4b6903.tar.gz gsoc2013-evolution-2bc072651cc5650a4a799746ba187cee8e4b6903.tar.zst gsoc2013-evolution-2bc072651cc5650a4a799746ba187cee8e4b6903.zip | |
removed non-existant headers.
2002-11-07 Rodrigo Moya <rodrigo@ximian.com>
* importers/icalendar-importer.c: removed non-existant headers.
* importers/Makefile.am: changes for BonoboActivation.
* gui/GNOME_Evolution_Calendar.server.in: install to $libdir, not
$datadir.
svn path=/trunk/; revision=18640
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/importers/.cvsignore | 2 | ||||
| -rw-r--r-- | calendar/importers/GNOME_Evolution_Calendar_Importer.server.in (renamed from calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in) | 0 | ||||
| -rw-r--r-- | calendar/importers/Makefile.am | 10 | ||||
| -rw-r--r-- | calendar/importers/icalendar-importer.c | 2 |
6 files changed, 16 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ba9603182f..8c17eb7da8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,14 @@ 2002-11-07 Rodrigo Moya <rodrigo@ximian.com> + * importers/icalendar-importer.c: removed non-existant headers. + + * importers/Makefile.am: changes for BonoboActivation. + + * gui/GNOME_Evolution_Calendar.server.in: install to $libdir, not + $datadir. + +2002-11-07 Rodrigo Moya <rodrigo@ximian.com> + * cal-client/query-listener.[ch]: converted to BonoboObject. * gui/dialogs/comp-editor-util.c (parse_contact_string): use glib's diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 1ae5c01c2e..37fd67eb18 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -181,7 +181,7 @@ evolution_calendar_LDADD = \ evolution_calendar_LDFLAGS = -export-dynamic -serversdir = $(datadir)/bonobo/servers +serversdir = $(libdir)/bonobo/servers servers_in_files = \ GNOME_Evolution_Calendar.server.in diff --git a/calendar/importers/.cvsignore b/calendar/importers/.cvsignore index dfa0930c53..0da04d0400 100644 --- a/calendar/importers/.cvsignore +++ b/calendar/importers/.cvsignore @@ -3,4 +3,4 @@ Makefile Makefile.in evolution-calendar-importer -GNOME_Evolution_Calendar_Importer.oaf +GNOME_Evolution_Calendar_Importer.server diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in index 710567dbc0..710567dbc0 100644 --- a/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in +++ b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index 6266ae9f5e..7e385ff477 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -33,11 +33,11 @@ evolution_calendar_importer_LDADD = \ $(top_builddir)/libical/src/libicalvcal/libicalvcal-evolution.la \ $(EVOLUTION_CALENDAR_LIBS) -oafdir = $(datadir)/oaf -oaf_in_files = GNOME_Evolution_Calendar_Importer.oaf.in +serversdir = $(libdir)/bonobo/servers +server_in_files = GNOME_Evolution_Calendar_Importer.server.in -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +servers_DATA = $(server_in_files:.server.in=.server) -EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) +EXTRA_DIST = $(server_in_files) $(servers_DATA) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index f887637e53..0300201ca4 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -26,11 +26,9 @@ #include <gtk/gtkcheckbutton.h> #include <gtk/gtkhbox.h> #include <gtk/gtkmain.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-util.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-exception.h> -#include <gal/util/e-unicode-i18n.h> #include <cal-client.h> #include <importer/evolution-importer.h> #include <importer/evolution-intelligent-importer.h> |