From 322c0cad7043d9b4b10b7dc71cec028ad00834d9 Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Wed, 11 Oct 2000 18:19:16 +0000 Subject: call calendar_config_write_on_exit() to write out some special config 2000-10-11 Damon Chaplin * gui/main.c (main): call calendar_config_write_on_exit() to write out some special config settings (as the mail component does). * gui/calendar-commands.c (properties_cmd): changed to use the new preferences dialog. (update_all_config_settings): new function to iterate over all the calendars and update the config settings. * gui/dialogs/cal-prefs-dialog.glade: preferences dialog. * gui/dialogs/cal-prefs-dialog.[hc]: new files for the preferences dialog. * gui/calendar-config.[hc]: new files to handle loading/saving config settings. * cal-util/cal-recur.c: fixed bug in YEARLY when no filters were set, plus minor changes. * cal-util/test-recur.c: updated. * gui/e-day-view-time-item.c: * gui/popup-menu.c: update to #include * gui/component-factory.c (owner_set_cb): called calendar_config_init. (owner_set_cb): (owner_unset_cb): updated the prototypes. * gui/main.c (main): added call to calendar_config_write_on_exit(). * gui/component-factory.h: * gui/component-factory.c (owner_set_cb): added global evolution_dir just like the mail component, so we know we to store config stuff. svn path=/trunk/; revision=5856 --- calendar/gui/component-factory.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'calendar/gui/component-factory.c') diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c index 351beee6b3..e47c8cf4af 100644 --- a/calendar/gui/component-factory.c +++ b/calendar/gui/component-factory.c @@ -27,6 +27,7 @@ #include #include "component-factory.h" #include "control-factory.h" +#include "calendar-config.h" #include "calendar-summary.h" @@ -36,7 +37,7 @@ static BonoboGenericFactory *factory = NULL; static BonoboGenericFactory *summary_factory = NULL; -static char *evolution_dir; +char *evolution_dir; static const EvolutionShellComponentFolderType folder_types[] = { { "calendar", "evolution-calendar.png" }, @@ -70,18 +71,18 @@ static gint owner_count = 0; static void owner_set_cb (EvolutionShellComponent *shell_component, - Evolution_Shell shell_interface, - const char *evolution_homedir) + EvolutionShellClient *shell_client, + const char *evolution_homedir, + gpointer user_data) { evolution_dir = g_strdup (evolution_homedir); + calendar_config_init (); owner_count ++; } static void owner_unset_cb (EvolutionShellComponent *shell_component, - Evolution_Shell shell_interface, - EvolutionShellClient shell_client, - void *data) + gpointer user_data) { g_free (evolution_dir); owner_count --; -- cgit v1.2.3