aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/importers
diff options
context:
space:
mode:
authorHans Petter Jansson <hpj@ximian.com>2003-03-01 05:08:45 +0800
committerHans Petter <hansp@src.gnome.org>2003-03-01 05:08:45 +0800
commit5569968699ce8163d51110eeefee8e8ebfe31b46 (patch)
tree0530f5a969922727207e1b6a60adece8cc662fb0 /calendar/importers
parent2ee1eb9078b7e5a356fe2c9cfb6782bcf005bdb7 (diff)
downloadgsoc2013-evolution-5569968699ce8163d51110eeefee8e8ebfe31b46.tar
gsoc2013-evolution-5569968699ce8163d51110eeefee8e8ebfe31b46.tar.gz
gsoc2013-evolution-5569968699ce8163d51110eeefee8e8ebfe31b46.tar.bz2
gsoc2013-evolution-5569968699ce8163d51110eeefee8e8ebfe31b46.tar.lz
gsoc2013-evolution-5569968699ce8163d51110eeefee8e8ebfe31b46.tar.xz
gsoc2013-evolution-5569968699ce8163d51110eeefee8e8ebfe31b46.tar.zst
gsoc2013-evolution-5569968699ce8163d51110eeefee8e8ebfe31b46.zip
Add calendar/importers/Makefile to output.
2003-02-28 Hans Petter Jansson <hpj@ximian.com> * configure.in: Add calendar/importers/Makefile to output. * calendar/Makefile.am (SUBDIRS): Add importers/. * calendar/importers/Makefile.am (server_in_files) (server_DATA): Insert $(libexecdir). * calendar/importers/icalendar-importer.c (connect_to_shell): oaf_activate_from_id() -> bonobo_activation_activate_from_id(). (load_vcalendar_file): U_() -> _(). svn path=/trunk/; revision=20109
Diffstat (limited to 'calendar/importers')
-rw-r--r--calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in (renamed from calendar/importers/GNOME_Evolution_Calendar_Importer.server.in)2
-rw-r--r--calendar/importers/Makefile.am6
-rw-r--r--calendar/importers/icalendar-importer.c5
3 files changed, 8 insertions, 5 deletions
diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
index 710567dbc0..c60468f5e8 100644
--- a/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in
+++ b/calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
@@ -2,7 +2,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"
type="exe"
- location="evolution-calendar-importer">
+ location="@LIBEXECDIR@/evolution-calendar-importer">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index 08006c21a3..887e1b97cc 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -31,9 +31,11 @@ evolution_calendar_importer_LDADD = \
$(top_builddir)/libical/src/libicalvcal/libicalvcal-evolution.la \
$(EVOLUTION_CALENDAR_LIBS)
-server_in_files = GNOME_Evolution_Calendar_Importer.server.in
+server_in_files = GNOME_Evolution_Calendar_Importer.server.in.in
-server_DATA = $(server_in_files:.server.in=.server)
+server_DATA = $(server_in_files:.server.in.in=.server)
+%.server.in: %.server.in.in
+ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
EXTRA_DIST = $(server_in_files) $(server_DATA)
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 6899679bc0..b8168ff39e 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -27,6 +27,7 @@
#include <gtk/gtkhbox.h>
#include <gtk/gtkmain.h>
#include <libgnome/gnome-util.h>
+#include <libgnome/gnome-i18n.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-exception.h>
#include <cal-client.h>
@@ -92,7 +93,7 @@ connect_to_shell (ICalImporter *ici)
GNOME_Evolution_Shell corba_shell;
CORBA_exception_init (&ev);
- corba_shell = oaf_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev);
+ corba_shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev);
if (BONOBO_EX (&ev)) {
CORBA_exception_free (&ev);
return;
@@ -481,7 +482,7 @@ load_vcalendar_file (const char *filename)
defaults.alarm_audio_url = "file://" EVOLUTION_SOUNDDIR "/default_alarm.wav";
defaults.alarm_audio_fmttype = "audio/x-wav";
- defaults.alarm_description = (char*) U_("Reminder!!");
+ defaults.alarm_description = (char*) _("Reminder!!");
contents = read_file (filename);