diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-11-26 10:31:52 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-11-26 10:31:52 +0800 |
| commit | e7defa25a587dfaa160211ce0e2941c044560b5a (patch) | |
| tree | 92e5a8b5ffb7010a28bced8e3eb9726411f27c81 /calendar/gui/alarm-notify | |
| parent | ae89d959aab24359c730375cff664ac3b44cc953 (diff) | |
| download | gsoc2013-evolution-e7defa25a587dfaa160211ce0e2941c044560b5a.tar.gz gsoc2013-evolution-e7defa25a587dfaa160211ce0e2941c044560b5a.tar.zst gsoc2013-evolution-e7defa25a587dfaa160211ce0e2941c044560b5a.zip | |
gui/calendar-commands.c gui/e-cal-list-view.c gui/e-calendar-table.c
2005-11-26 Tor Lillqvist <tml@novell.com>
* gui/calendar-commands.c
* gui/e-cal-list-view.c
* gui/e-calendar-table.c
* gui/e-memo-table.c
* gui/e-memos.c
* gui/e-tasks.c
* gui/gnome-cal.c
* gui/goto.c
* gui/memos-control.c
* gui/tasks-control.c
* gui/alarm-notify/alarm-notify-dialog.c
* gui/alarm-notify/notify-main.c
* gui/dialogs/alarm-dialog.c
* gui/dialogs/alarm-list-dialog.c
* gui/dialogs/cal-attachment.c
* gui/dialogs/cal-prefs-dialog.c
* gui/dialogs/comp-editor.c
* gui/dialogs/e-delegate-dialog.c
* gui/dialogs/event-editor.c
* gui/dialogs/meeting-page.c
* gui/dialogs/memo-page.c
* gui/dialogs/recurrence-page.c
* gui/dialogs/schedule-page.c
* gui/dialogs/task-details-page.c
* gui/dialogs/task-page.c
* gui/dialogs/url-editor-dialog.c: Include e-util-private.h to get
redefinition of compile-time pathnames as calls to functions on
Windows. Construct the pathnames of files and directories under
the installation prefix at run-time to enable install-anywhere on
Windows. No effect on functionality on Unix.
svn path=/trunk/; revision=30679
Diffstat (limited to 'calendar/gui/alarm-notify')
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-notify-dialog.c | 9 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/notify-main.c | 12 |
2 files changed, 18 insertions, 3 deletions
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 0e545721d6..4aa356af3e 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -44,6 +44,7 @@ #include "config-data.h" #include "util.h" #include <e-util/e-icon-factory.h> +#include <e-util/e-util-private.h> @@ -218,8 +219,14 @@ notified_alarms_dialog_new (void) G_TYPE_POINTER, /* End */ G_TYPE_POINTER /* FuncInfo*/)); + char *gladefile; - an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL, NULL); + gladefile = g_build_filename (EVOLUTION_GLADEDIR, + "alarm-notify.glade", + NULL); + an->xml = glade_xml_new (gladefile, NULL, NULL); + g_free (gladefile); + if (!an->xml) { g_message ("alarm_notify_dialog(): Could not load the Glade XML file!"); g_free (an); diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index 4dca946d76..348b94a42e 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -40,6 +40,7 @@ #include <libedataserver/e-source.h> #include <libedataserverui/e-passwords.h> #include "e-util/e-icon-factory.h" +#include "e-util/e-util-private.h" #include "alarm.h" #include "alarm-queue.h" #include "alarm-notify.h" @@ -70,10 +71,17 @@ save_session_cb (GnomeClient *client, GnomeSaveStyle save_style, gint shutdown, { char *args[2]; - args[0] = EVOLUTION_LIBEXECDIR "/evolution-alarm-notify"; + args[0] = g_build_filename (EVOLUTION_LIBEXECDIR, + "evolution-alarm-notify" +#ifdef G_OS_WIN32 + ".exe" +#endif + , + NULL); args[1] = NULL; gnome_client_set_restart_command (client, 1, args); - + g_free (args[0]); + return TRUE; } |