aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/gui/alarm-notify/Makefile.am20
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.c6
-rw-r--r--calendar/gui/alarm-notify/notify-main.c4
3 files changed, 11 insertions, 19 deletions
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index d53a2360c5..4766db866a 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -11,8 +11,7 @@ idl_flags = $(IDL_INCLUDES)
$(CORBA_GENERATED): $(idls)
$(ORBIT_IDL) $(idl_flags) $(top_srcdir)/calendar/idl/evolution-calendar.idl
-evolibexecdir = $(libexecdir)/evolution/$(BASE_VERSION)
-evolibexec_PROGRAMS = evolution-alarm-notify
+privlibexec_PROGRAMS = evolution-alarm-notify
noinst_LIBRARIES = libalarm.a
@@ -28,15 +27,11 @@ INCLUDES = \
-I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/widgets \
- -I$(includedir) \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
-
glade_DATA = \
alarm-notify.glade
@@ -63,19 +58,16 @@ evolution_alarm_notify_LDADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_CALENDAR_LIBS)
-evolution_alarm_notify_LDFLAGS = -export-dynamic
-
-serversdir = $(libdir)/bonobo/servers
-servers_in_files = \
+server_in_files = \
GNOME_Evolution_Calendar_AlarmNotify.server.in
-servers_DATA = $(servers_in_files:.server.in=.server)
+server_DATA = $(server_in_files:.server.in=.server)
@INTLTOOL_SERVER_RULE@
EXTRA_DIST = \
- $(servers_DATA) \
- $(servers_in_files) \
+ $(server_DATA) \
+ $(server_in_files) \
$(glade_DATA)
BUILT_SOURCES = $(CORBA_GENERATED)
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 0eefb533c1..b9c2606aed 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -243,8 +243,8 @@ write_html_heading (GtkHTMLStream *stream, const char *message,
{
char *buf;
char *start, *end;
- char *bg_path = "file://" EVOLUTION_ICONSDIR "/bcg.png";
- char *image_path = "file://" EVOLUTION_ICONSDIR "/alarm.png";
+ char *bg_path = "file://" EVOLUTION_IMAGESDIR "/bcg.png";
+ char *image_path = "file://" EVOLUTION_IMAGESDIR "/alarm.png";
icaltimezone *current_zone;
/* Stringize the times */
@@ -403,7 +403,7 @@ alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
#if 0
gnome_win_hints_set_state (an->dialog, WIN_STATE_STICKY);
gnome_win_hints_set_layer (an->dialog, WIN_LAYER_ONTOP);
- gnome_window_icon_set_from_file (GTK_WINDOW (an->dialog), EVOLUTION_ICONSDIR "/alarm.png");
+ gnome_window_icon_set_from_file (GTK_WINDOW (an->dialog), EVOLUTION_IMAGESDIR "/alarm.png");
#endif
gtk_widget_show (an->dialog);
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 2577024d3c..41a7b6e8f6 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -160,8 +160,8 @@ load_calendars (gpointer user_data)
int
main (int argc, char **argv)
{
- bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
- textdomain (PACKAGE);
+ bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+ textdomain (GETTEXT_PACKAGE);
gnome_program_init ("evolution-alarm-notify", VERSION, LIBGNOME_MODULE, argc, argv, NULL);
bonobo_activation_init (argc, argv);