From 94daae3dba8e86e88f69320bc82795fe660ec9cd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 15 Jun 2012 09:04:08 +0200 Subject: Remove the last remaining usage of GConf --- modules/calendar/Makefile.am | 30 - .../calendar/apps_evolution_calendar.schemas.in | 839 --------------------- modules/calendar/e-cal-shell-settings.c | 37 +- 3 files changed, 17 insertions(+), 889 deletions(-) delete mode 100644 modules/calendar/apps_evolution_calendar.schemas.in (limited to 'modules/calendar') diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index 43465f39fe..0bcc72cfde 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -102,39 +102,9 @@ module_calendar_la_LIBADD = \ module_calendar_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = apps_evolution_calendar.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ - ui_DATA = e-calendar-preferences.ui EXTRA_DIST = \ - $(schema_in_files) \ $(ui_DATA) -DISTCLEANFILES = $(schema_DATA) - -if GCONF_SCHEMAS_INSTALL -if OS_WIN32 -install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ - echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ - cmd /c _temp.bat; \ - rm _temp.bat; \ - done \ - fi -else -install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ - fi -endif -endif - -include $(top_srcdir)/git.mk diff --git a/modules/calendar/apps_evolution_calendar.schemas.in b/modules/calendar/apps_evolution_calendar.schemas.in deleted file mode 100644 index c34852ed4e..0000000000 --- a/modules/calendar/apps_evolution_calendar.schemas.in +++ /dev/null @@ -1,839 +0,0 @@ - - - - - - - /schemas/apps/evolution/calendar/display/primary_calendar - /apps/evolution/calendar/display/primary_calendar - evolution-calendar - string - - - Primary calendar - - The UID of the selected (or "primary") calendar in the - sidebar of the "Calendar" view. - - - - - - /schemas/apps/evolution/calendar/display/timezone - /apps/evolution/calendar/display/timezone - evolution-calendar - string - UTC - - Timezone - The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York". - - - - - /schemas/apps/evolution/calendar/display/use_system_timezone - /apps/evolution/calendar/display/use_system_timezone - evolution-calendar - bool - true - - Use system timezone - Use the system timezone instead of the timezone selected - in Evolution. - - - - - /schemas/apps/evolution/calendar/display/day_second_zone - /apps/evolution/calendar/display/day_second_zone - evolution-calendar - string - - - The second timezone for a Day View - Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key. - - - - - /schemas/apps/evolution/calendar/display/day_second_zones - /apps/evolution/calendar/display/day_second_zones - evolution-calendar - list - string - [] - - Recently used second time zones in a Day View - List of recently used second time zones in a Day View. - - - - - /schemas/apps/evolution/calendar/display/day_second_zones_max - /apps/evolution/calendar/display/day_second_zones_max - evolution-calendar - int - 5 - - Maximum number of recently used timezones to remember. - Maximum number of recently used timezones to remember in a 'day_second_zones' list. - - - - - /schemas/apps/evolution/calendar/display/use_24hour_format - /apps/evolution/calendar/display/use_24hour_format - evolution-calendar - bool - false - - Twenty four hour time format - Whether to show times in twenty four hour format instead of using am/pm. - - - - - /schemas/apps/evolution/calendar/display/show_role - /apps/evolution/calendar/display/show_role - evolution-calendar - bool - true - - Show Role field in the event/task/meeting editor - Whether to show role field in the event/task/meeting editor - - - - - /schemas/apps/evolution/calendar/display/show_status - /apps/evolution/calendar/display/show_status - evolution-calendar - bool - false - - Show status field in the event/task/meeting editor - Whether to show status field in the event/task/meeting editor - - - - - /schemas/apps/evolution/calendar/display/show_type - /apps/evolution/calendar/display/show_type - evolution-calendar - bool - false - - Show type field in the event/task/meeting editor - Whether to show type field in the event/task/meeting editor - - - - - /schemas/apps/evolution/calendar/display/show_rsvp - /apps/evolution/calendar/display/show_rsvp - evolution-calendar - bool - false - - Show RSVP field in the event/task/meeting editor - Whether to show RSVP field in the event/task/meeting editor - - - - - /schemas/apps/evolution/calendar/display/show_timezone - /apps/evolution/calendar/display/show_timezone - evolution-calendar - bool - false - - Show timezone field in the event/meeting editor - Whether to show timezone field in the event/meeting editor - - - - - /schemas/apps/evolution/calendar/display/show_categories - /apps/evolution/calendar/display/show_categories - evolution-calendar - bool - false - - Show categories field in the event/meeting/task editor - Whether to show categories field in the event/meeting editor - - - - - /schemas/apps/evolution/calendar/display/week_start_day - /apps/evolution/calendar/display/week_start_day - evolution-calendar - int - 1 - - Week start - Weekday the week starts on, from Sunday (0) to Saturday (6). - - - - - /schemas/apps/evolution/calendar/display/day_start_hour - /apps/evolution/calendar/display/day_start_hour - evolution-calendar - int - 9 - - Workday start hour - Hour the workday starts on, in twenty four hour format, 0 to 23. - - - - - /schemas/apps/evolution/calendar/display/day_start_minute - /apps/evolution/calendar/display/day_start_minute - evolution-calendar - int - 0 - - Workday start minute - Minute the workday starts on, 0 to 59. - - - - - /schemas/apps/evolution/calendar/display/day_end_hour - /apps/evolution/calendar/display/day_end_hour - evolution-calendar - int - 17 - - Workday end hour - Hour the workday ends on, in twenty four hour format, 0 to 23. - - - - - /schemas/apps/evolution/calendar/display/day_end_minute - /apps/evolution/calendar/display/day_end_minute - evolution-calendar - int - 0 - - Workday end minute - Minute the workday ends on, 0 to 59. - - - - - /schemas/apps/evolution/calendar/display/time_divisions - /apps/evolution/calendar/display/time_divisions - evolution-calendar - int - 30 - - Time divisions - Intervals shown in Day and Work Week views, in minutes. - - - - - /schemas/apps/evolution/calendar/display/hpane_position - /apps/evolution/calendar/display/hpane_position - evolution-calendar - int - 400 - - Horizontal pane position - Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels. - - - - - /schemas/apps/evolution/calendar/display/vpane_position - /apps/evolution/calendar/display/vpane_position - evolution-calendar - int - 150 - - Vertical pane position - Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels. - - - - - /schemas/apps/evolution/calendar/display/month_hpane_position - /apps/evolution/calendar/display/month_hpane_position - evolution-calendar - int - 32000 - - Month view horizontal pane position - Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels. - - - - - /schemas/apps/evolution/calendar/display/month_vpane_position - /apps/evolution/calendar/display/month_vpane_position - evolution-calendar - int - 150 - - Month view vertical pane position - Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels. - - - - /schemas/apps/evolution/calendar/display/date_navigator_pane_position - /apps/evolution/calendar/display/date_navigator_pane_position - evolution-calendar - int - 150 - - Month view vertical pane position - Position of the vertical pane, between the calendar lists and the date navigator calendar. - - - - - /schemas/apps/evolution/calendar/display/memo_layout - /apps/evolution/calendar/display/memo_layout - int - 0 - - Memo layout style - - The layout style determines where to place the preview pane - in relation to the memo list. "0" (Classic View) places the - preview pane below the memo list. "1" (Vertical View) places - the preview pane next to the memo list. - - - - - - /schemas/apps/evolution/calendar/display/show_memo_preview - /apps/evolution/calendar/display/show_memo_preview - evolution-calendar - bool - true - - Show the memo preview pane - - If "true", show the memo preview pane in the main window. - - - - - - /schemas/apps/evolution/calendar/display/memo_hpane_position - /apps/evolution/calendar/display/memo_hpane_position - evolution-calendar - int - 200 - - Memo preview pane position (horizontal) - - Position of the task preview pane when oriented horizontally. - - - - - - /schemas/apps/evolution/calendar/display/memo_vpane_position - /apps/evolution/calendar/display/memo_vpane_position - evolution-calendar - int - 400 - - Memo preview pane position (vertical) - - Position of the memo preview pane when oriented vertically. - - - - - - /schemas/apps/evolution/calendar/display/task_layout - /apps/evolution/calendar/display/task_layout - int - 0 - - Task layout style - - The layout style determines where to place the preview pane - in relation to the task list. "0" (Classic View) places the - preview pane below the task list. "1" (Vertical View) places - the preview pane next to the task list. - - - - - - /schemas/apps/evolution/calendar/display/show_task_preview - /apps/evolution/calendar/display/show_task_preview - evolution-calendar - bool - true - - Show the task preview pane - - If "true", show the task preview pane in the main window. - - - - - - /schemas/apps/evolution/calendar/display/task_hpane_position - /apps/evolution/calendar/display/task_hpane_position - evolution-calendar - int - 200 - - Task preview pane position (horizontal) - - Position of the task preview pane when oriented horizontally. - - - - - - /schemas/apps/evolution/calendar/display/task_vpane_position - /apps/evolution/calendar/display/task_vpane_position - evolution-calendar - int - 400 - - Task preview pane position (vertical) - - Position of the task preview pane when oriented vertically. - - - - - - /schemas/apps/evolution/calendar/display/compress_weekend - /apps/evolution/calendar/display/compress_weekend - evolution-calendar - bool - true - - Compress weekends in month view - Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday. - - - - - /schemas/apps/evolution/calendar/display/show_event_end - /apps/evolution/calendar/display/show_event_end - evolution-calendar - bool - true - - Show appointment end times in week and month views - Whether to display the end time of events in the week and month views. - - - - - /schemas/apps/evolution/calendar/display/working_days - /apps/evolution/calendar/display/working_days - evolution-calendar - int - 62 - - Work days - Days on which the start and end of work hours should be indicated. - - - - - /schemas/apps/evolution/calendar/display/marcus_bains_line - /apps/evolution/calendar/display/marcus_bains_line - evolution-calendar - bool - true - - Marcus Bains Line - Whether to draw the Marcus Bains Line (line at current time) in the calendar. - - - - - /schemas/apps/evolution/calendar/display/marcus_bains_color_dayview - /apps/evolution/calendar/display/marcus_bains_color_dayview - evolution-calendar - string - #ff0000 - - Marcus Bains Line Color - Day View - Color to draw the Marcus Bains line in the Day View. - - - - - /schemas/apps/evolution/calendar/display/marcus_bains_color_timebar - /apps/evolution/calendar/display/marcus_bains_color_timebar - evolution-calendar - string - #ff0000 - - Marcus Bains Line Color - Time bar - Color to draw the Marcus Bains Line in the Time bar (empty for default). - - - - - /schemas/apps/evolution/calendar/display/recur_events_italic - /apps/evolution/calendar/display/recur_events_italic - evolution-calendar - bool - false - - Recurrent Events in Italic - Show days with recurrent events in italic font in bottom left calendar. - - - - - - - /schemas/apps/evolution/calendar/memos/primary_memos - /apps/evolution/calendar/memos/primary_memos - evolution-calendar - string - - - Primary memo list - - The UID of the selected (or "primary") memo list in the - sidebar of the "Memos" view. - - - - - - - - /schemas/apps/evolution/calendar/tasks/primary_tasks - /apps/evolution/calendar/tasks/primary_tasks - evolution-calendar - string - - - Primary task list - - The UID of the selected (or "primary") task list in the - sidebar of the "Tasks" view. - - - - - - /schemas/apps/evolution/calendar/tasks/hide_completed - /apps/evolution/calendar/tasks/hide_completed - evolution-calendar - bool - false - - Hide completed tasks - Whether to hide completed tasks in the tasks view. - - - - - /schemas/apps/evolution/calendar/tasks/hide_completed_units - /apps/evolution/calendar/tasks/hide_completed_units - evolution-calendar - string - days - - Hide task units - Units for determining when to hide tasks, "minutes", "hours" or "days". - - - - - /schemas/apps/evolution/calendar/tasks/hide_completed_value - /apps/evolution/calendar/tasks/hide_completed_value - evolution-calendar - int - 1 - - Hide task value - Number of units for determining when to hide tasks. - - - - - - - /schemas/apps/evolution/calendar/tasks/colors/due_today - /apps/evolution/calendar/tasks/colors/due_today - evolution-calendar - string - #1e90ff - - Tasks due today color - Background color of tasks that are due today, in "#rrggbb" format. - - - - - /schemas/apps/evolution/calendar/tasks/colors/overdue - /apps/evolution/calendar/tasks/colors/overdue - evolution-calendar - string - #ff0000 - - Overdue tasks color - Background color of tasks that are overdue, in "#rrggbb" format. - - - - - - - /schemas/apps/evolution/calendar/prompts/confirm_delete - /apps/evolution/calendar/prompts/confirm_delete - evolution-calendar - bool - true - - Ask for confirmation when deleting items - Whether to ask for confirmation when deleting an appointment or task. - - - - - /schemas/apps/evolution/calendar/prompts/confirm_purge - /apps/evolution/calendar/prompts/confirm_purge - evolution-calendar - bool - true - - Confirm expunge - Whether to ask for confirmation when expunging appointments and tasks. - - - - - /schemas/apps/evolution/calendar/other/use_default_reminder - /apps/evolution/calendar/other/use_default_reminder - evolution-calendar - bool - false - - Default appointment reminder - Whether to set a default reminder for appointments. - - - - - /schemas/apps/evolution/calendar/other/default_reminder_interval - /apps/evolution/calendar/other/default_reminder_interval - evolution-calendar - int - 15 - - Default reminder value - Number of units for determining a default reminder. - - - - - /schemas/apps/evolution/calendar/other/default_reminder_units - /apps/evolution/calendar/other/default_reminder_units - evolution-calendar - string - minutes - - Default reminder units - Units for a default reminder, "minutes", "hours" or "days". - - - - - /schemas/apps/evolution/calendar/other/use_ba_reminder - /apps/evolution/calendar/other/use_ba_reminder - evolution-calendar - bool - false - - Birthday and anniversary reminder - - Whether to set a reminder for birthdays and anniversaries. - - - - - - /schemas/apps/evolution/calendar/other/ba_reminder_interval - /apps/evolution/calendar/other/ba_reminder_interval - evolution-calendar - int - 15 - - Birthday and anniversary reminder value - - Number of units for determining a birthday or anniversary reminder. - - - - - - /schemas/apps/evolution/calendar/other/ba_reminder_units - /apps/evolution/calendar/other/ba_reminder_units - evolution-calendar - string - minutes - - Birthday and anniversary reminder units - - Units for a birthday or anniversary reminder, "minutes", "hours" - or "days". - - - - - - /schemas/apps/evolution/calendar/display/show_week_numbers - /apps/evolution/calendar/display/show_week_numbers - evolution-calendar - bool - false - - Show week numbers in Day View, Work Week View, and Date Navigator - Whether to show week numbers in various places in the Calendar. - - - - - /schemas/apps/evolution/calendar/display/month_scroll_by_week - /apps/evolution/calendar/display/month_scroll_by_week - evolution-calendar - bool - true - - Scroll Month View by a week - Whether to scroll a Month View by a week, not by a month. - - - - - - - /schemas/apps/evolution/calendar/notify/last_notification_time - /apps/evolution/calendar/notify/last_notification_time - evolution-calendar - int - -1 - - Last reminder time - Time the last reminder ran, in time_t. - - - - - /schemas/apps/evolution/calendar/notify/calendars - /apps/evolution/calendar/notify/calendars - evolution-calendar - list - string - [] - - Calendars to run reminders for - - - - - /schemas/apps/evolution/calendar/notify/programs - /apps/evolution/calendar/notify/programs - evolution-calendar - list - string - [] - - Reminder programs - Programs that are allowed to be run by reminders. - - - - - /schemas/apps/evolution/calendar/notify/notify_with_tray - /apps/evolution/calendar/notify/notify_with_tray - evolution-calendar - bool - false - - Show display reminders in notification tray - Whether or not to use the notification tray for display reminders. - - - - - /schemas/apps/evolution/calendar/publish/uris - /apps/evolution/calendar/publish/uris - evolution-calendar - list - string - [] - - Free/busy server URLs - List of server URLs for free/busy publishing. - - - - - /schemas/apps/evolution/calendar/publish/template - /apps/evolution/calendar/publish/template - evolution-calendar - string - - - Free/busy template URL - 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. - - - - - /schemas/apps/evolution/calendar/audio_dir - /apps/evolution/calendar/audio_dir - evolution-calendar - string - - - Save directory for reminder audio - - Directory for saving reminder audio files - - - - - - /schemas/apps/evolution/calendar/display/error_timeout - /apps/evolution/calendar/display/error_timeout - evolution-calendar - int - 60 - - Amount of time in seconds the error should be shown on the status bar. - Amount of time in seconds the error should be shown on the status bar. - - - - - /schemas/apps/evolution/calendar/display/error_level - /apps/evolution/calendar/display/error_level - evolution-calendar - int - 0 - - Level beyond which the message should be logged. - This can have three possible values. 0 for errors. 1 for warnings. - 2 for debug messages. - - - - - diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c index e160d18810..ade121d9c7 100644 --- a/modules/calendar/e-cal-shell-settings.c +++ b/modules/calendar/e-cal-shell-settings.c @@ -104,10 +104,10 @@ transform_icaltimezone_to_string (GBinding *binding, } static gboolean -transform_weekdays_gconf_to_evolution (GBinding *binding, - const GValue *source_value, - GValue *target_value, - gpointer user_data) +transform_weekdays_settings_to_evolution (GBinding *binding, + const GValue *source_value, + GValue *target_value, + gpointer user_data) { GDateWeekday weekday; @@ -119,7 +119,7 @@ transform_weekdays_gconf_to_evolution (GBinding *binding, /* This is purposefully verbose for better readability. */ - /* GConf numbering */ + /* setting numbering */ switch (g_value_get_int (source_value)) { case 0: weekday = G_DATE_SUNDAY; @@ -177,10 +177,10 @@ transform_weekdays_gconf_to_evolution (GBinding *binding, } static gboolean -transform_weekdays_evolution_to_gconf (GBinding *binding, - const GValue *source_value, - GValue *target_value, - gpointer user_data) +transform_weekdays_evolution_to_settings (GBinding *binding, + const GValue *source_value, + GValue *target_value, + gpointer user_data) { GDateWeekday weekday; @@ -192,7 +192,7 @@ transform_weekdays_evolution_to_gconf (GBinding *binding, /* This is purposefully verbose for better readability. */ - /* GConf numbering */ + /* setting numbering */ switch (g_value_get_int (source_value)) { case 0: weekday = G_DATE_MONDAY; @@ -692,7 +692,7 @@ e_cal_shell_backend_init_settings (EShell *shell) /* Do not bind to this. Use "cal-week-start-day" instead. */ e_shell_settings_install_property_for_key ( - "cal-week-start-day-gconf", + "cal-week-start-day-setting", CALENDAR_SCHEMA, "week-start-day"); @@ -727,11 +727,8 @@ e_cal_shell_backend_init_settings (EShell *shell) "prefer-new-item"); /* These properties use transform functions to convert - * GConf values to forms more useful to Evolution. We - * have to use separate properties because GConfBridge - * does not support transform functions. Much of this - * is backward-compatibility cruft for poorly designed - * GConf schemas. */ + * GSettings values to forms more useful to Evolution. + */ e_shell_settings_install_property ( g_param_spec_enum ( @@ -815,15 +812,15 @@ e_cal_shell_backend_init_settings (EShell *shell) G_PARAM_READWRITE)); g_object_bind_property_full ( - shell_settings, "cal-week-start-day-gconf", + shell_settings, "cal-week-start-day-setting", shell_settings, "cal-week-start-day", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE, - transform_weekdays_gconf_to_evolution, - transform_weekdays_evolution_to_gconf, + transform_weekdays_settings_to_evolution, + transform_weekdays_evolution_to_settings, NULL, (GDestroyNotify) NULL); - /* XXX These are my favorite. Storing a bit array in GConf + /* XXX These are my favorite. Storing a bit array in GSettings * instead of separate boolean keys. Brilliant move. */ e_shell_settings_install_property ( -- cgit v1.2.3