diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/apps_evolution_calendar.schemas.in.in | 14 | ||||
| -rw-r--r-- | calendar/gui/calendar-config-keys.h | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/alarm-dialog.c | 1 |
4 files changed, 24 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d235e04709..6a97fbfa9b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2006-11-28 Daniel Gryniewicz <dang@gentoo.org> + + ** Fix for bug #349966 + + * gui/apps_evolution_calendar.schemas.in.in: + * gui/calendar-config-keys.h: + * gui/dialogs/alarm-dialog.c: (action_selection_done_cb): + 2006-11-20 Carlos Garcia Campos <carlosgc@gnome.org> Fixes bug #367183 diff --git a/calendar/gui/apps_evolution_calendar.schemas.in.in b/calendar/gui/apps_evolution_calendar.schemas.in.in index 34730bd303..e024826c95 100644 --- a/calendar/gui/apps_evolution_calendar.schemas.in.in +++ b/calendar/gui/apps_evolution_calendar.schemas.in.in @@ -577,5 +577,19 @@ <long>The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain.</long> </locale> </schema> + + <schema> + <key>/schemas/apps/evolution/calendar/audio_dir</key> + <applyto>/apps/evolution/calendar/audio_dir</applyto> + <owner>evolution-calendar</owner> + <type>string</type> + <locale name="C"> + <short>Save directory for alarm audio</short> + <long> + Directory for saving alarm audio files + </long> + </locale> + </schema> + </schemalist> </gconfschemafile> diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h index 2f85954ab7..b1fe13918b 100644 --- a/calendar/gui/calendar-config-keys.h +++ b/calendar/gui/calendar-config-keys.h @@ -91,7 +91,7 @@ G_BEGIN_DECLS /* Free/Busy settings */ #define CALENDAR_CONFIG_TEMPLATE CALENDAR_CONFIG_PREFIX"/publish/template" -#define CALENDAR_CONFIG_SAVE_DIR "/apps/evolution/mail/save_dir" +#define CALENDAR_CONFIG_SAVE_DIR CALENDAR_CONFIG_PREFIX"/audio_dir" G_END_DECLS #endif diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 90f3e72e2b..d6e03cc036 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -1080,6 +1080,7 @@ action_selection_done_cb (GtkMenuShell *menu_shell, gpointer data) dir = calendar_config_get_dir_path (); if ( dir && *dir ) gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (dialog->aalarm_file_entry), dir); + g_free (dir); check_custom_sound (dialog); break; |