diff options
Diffstat (limited to 'calendar/importers')
| -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 |
4 files changed, 6 insertions, 8 deletions
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> |